diff options
| author | Ben Widawsky | 2013-12-06 23:11:01 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2013-12-18 15:27:53 +0100 |
| commit | 67e3d2979be1bf42d1818b2961c671eb31e0b4d9 (patch) | |
| tree | d4fcbfc9f684991ee307fddc8d767e1637412d13 /drivers/gpu/drm/i915/i915_gem_execbuffer.c | |
| parent | drm/i915: Simplify ring handling in execbuf (diff) | |
| download | kernel-qcow2-linux-67e3d2979be1bf42d1818b2961c671eb31e0b4d9.tar.gz kernel-qcow2-linux-67e3d2979be1bf42d1818b2961c671eb31e0b4d9.tar.xz kernel-qcow2-linux-67e3d2979be1bf42d1818b2961c671eb31e0b4d9.zip | |
drm/i915: Permit contexts on all rings
If we want to use contexts in more abstract terms (specifically with
PPGTT in mind), we need to allow them to be specified for any ring.
Since the upcoming patches will bring about the use of multiple address
spaces, and each ring needs to have an address space programmed (which
we intend to do at context switch time), we can no longer only use RCS.
With multiple rings having a last context, we must now unreference these
contexts.
NOTE: This commit requires an update to intel-gpu-tools to make it not
fail.
v2: Rebased with some logical conflicts.
Squashed in the context fini refcount patch
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_execbuffer.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_execbuffer.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c index dfe7cb912e29..d608a07f4398 100644 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c @@ -1011,9 +1011,6 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data, (int)(args->flags & I915_EXEC_RING_MASK)); return -EINVAL; } - if (ctx_id != DEFAULT_CONTEXT_ID && - (args->flags & I915_EXEC_RING_MASK) > I915_EXEC_RENDER) - return -EPERM; if ((args->flags & I915_EXEC_RING_MASK) == I915_EXEC_DEFAULT) ring = &dev_priv->ring[RCS]; |