summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2012-07-23 12:33:55 -0700
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-07-25 10:39:59 +0200
commit0da5cec1de1eb39563fb6ca2be48c0e56fed6309 (patch)
tree427e07994ce7c4428c939390bb705e9849a766f7 /drivers/gpu
parent35313cde4c582f3581a4b8397311f302680625f5 (diff)
downloadop-kernel-dev-0da5cec1de1eb39563fb6ca2be48c0e56fed6309.zip
op-kernel-dev-0da5cec1de1eb39563fb6ca2be48c0e56fed6309.tar.gz
drm/i915: Set the context before setting up regs for the context.
Fixes failures in transform feedback on gen7 because our SOL_RESET flag was setting the transform feedback offsets in the old context (occasionally happened to be ours) instead of the new context. Signed-off-by: Eric Anholt <eric@anholt.net> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/i915/i915_gem_execbuffer.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index 981e14f..5af631e 100644
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -1228,6 +1228,10 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,
}
}
+ ret = i915_switch_context(ring, file, ctx_id);
+ if (ret)
+ goto err;
+
if (ring == &dev_priv->ring[RCS] &&
mode != dev_priv->relative_constants_mode) {
ret = intel_ring_begin(ring, 4);
@@ -1249,10 +1253,6 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,
goto err;
}
- ret = i915_switch_context(ring, file, ctx_id);
- if (ret)
- goto err;
-
trace_i915_gem_ring_dispatch(ring, seqno);
exec_start = batch_obj->gtt_offset + args->batch_start_offset;
OpenPOWER on IntegriCloud