* [PATCH] drm/i915: Set the context before setting up regs for the context.
@ 2012-07-23 19:33 Eric Anholt
2012-07-23 20:05 ` Daniel Vetter
0 siblings, 1 reply; 2+ messages in thread
From: Eric Anholt @ 2012-07-23 19:33 UTC (permalink / raw)
To: intel-gfx
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>
---
drivers/gpu/drm/i915/i915_gem_execbuffer.c | 8 ++++----
1 file 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 e0489aa..25b2c54 100644
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -1030,6 +1030,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);
@@ -1051,10 +1055,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;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drm/i915: Set the context before setting up regs for the context.
2012-07-23 19:33 [PATCH] drm/i915: Set the context before setting up regs for the context Eric Anholt
@ 2012-07-23 20:05 ` Daniel Vetter
0 siblings, 0 replies; 2+ messages in thread
From: Daniel Vetter @ 2012-07-23 20:05 UTC (permalink / raw)
To: Eric Anholt; +Cc: intel-gfx
On Mon, Jul 23, 2012 at 12:33:55PM -0700, Eric Anholt wrote:
> 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>
Picked up for -fixes, thanks for the patch.
-Daniel
--
Daniel Vetter
Mail: daniel@ffwll.ch
Mobile: +41 (0)79 365 57 48
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-07-23 20:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-07-23 19:33 [PATCH] drm/i915: Set the context before setting up regs for the context Eric Anholt
2012-07-23 20:05 ` Daniel Vetter
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.