drm/i915: Don't forget to apply SNB PIPE_CONTROL GTT workaround.
Subsystems (2)
PATCH 1/1 drm/i915: Don't forget to apply SNB PIPE_CONTROL GTT workaround.
If a buffer that was the target of a PIPE_CONTROL from userland was a reused one that hadn't been evicted which had not previously had this workaround applied, then we would not bind it into the GTT and the write would land somewhere else.
Based on a doubting-my-sanity debugging session with cworth, I'm pretty sure this will fix his reproducible GL_EXT_timer_query failures, and hopefully the intermittent OQ issues on snb that danvet's been working on.
I have not tested it yet, but hopefully when cworth gets home he will.
--- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/i915_gem_execbuffer.c +10 -10
@@ -117,6 +117,16 @@ i915_gem_execbuffer_relocate_entry(struct drm_i915_gem_object *obj, target_i915_obj =to_intel_bo (target_obj); target_offset = target_i915_obj->gtt_offset; +/* Sandybridge PPGTT errata: We need a global gtt mapping for MI and +* pipe_control writes because the gpu doesn't properly redirect them +* through the ppgtt for non_secure batchbuffers. */ +if (unlikely (IS_GEN6 (dev) && + reloc->write_domain ==I915_GEM_DOMAIN_INSTRUCTION && + !target_i915_obj->has_global_gtt_mapping)) { +i915_gem_gtt_bind_object (target_i915_obj, + target_i915_obj->cache_level); + } +/* The target buffer should have appeared before us in the * exec_object list, so it should have a GTT space bound by now. */
@@ -225,16 +235,6 @@ i915_gem_execbuffer_relocate_entry(struct drm_i915_gem_object *obj,io_mapping_unmap_atomic (reloc_page); } -/* Sandybridge PPGTT errata: We need a global gtt mapping for MI and -* pipe_control writes because the gpu doesn't properly redirect them -* through the ppgtt for non_secure batchbuffers. */ -if (unlikely (IS_GEN6 (dev) && - reloc->write_domain ==I915_GEM_DOMAIN_INSTRUCTION && - !target_i915_obj->has_global_gtt_mapping)) { -i915_gem_gtt_bind_object (target_i915_obj, - target_i915_obj->cache_level); - } -/* and update the user's relocation entry */ reloc->presumed_offset = target_offset;
Signature · 1 line
1.7.10.4
Quoted 11 lines · Eric Anholt
If a buffer that was the target of a
PIPE_CONTROLfrom userland was a reused one that hadn't been evicted which had not previously had this workaround applied, then we would not bind it into the GTT and the write would land somewhere else.Based on a doubting-my-sanity debugging session with cworth, I'm pretty sure this will fix his reproducible
GL_EXT_timer_queryfailures, and hopefully the intermittent OQ issues on snb that danvet's been working on.I have not tested it yet, but hopefully when cworth gets home he will.
Had to look hard to find the secret ingredient. The reason why this patch will work is that that in the middle of the error checking we have an early success return after applying the new reloc domains iff the object still holds the same GTT offset as presumed by the reloc.
Probably deserves a little more clarification in the changelog as to why the patch works.
I think this should also fix
https://bugs.freedesktop.org/show_bug.cgi?id=48019
but my snb has decided today is the day to hard hang instead. -Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
Quoted 1 line · Eric Anholt
I have not tested it yet, but hopefully when cworth gets home he will.
Thanks, Eric! This is perfect.
-Carl
Signature · 1 line
[email protected]
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 drm/i915: Don't forget to apply SNB PIPE_CONTROL GTT workaround.
In reply to Eric AnholtIf a buffer that was the target of a PIPE_CONTROL from userland was a reused one that hadn't been evicted which had not previously had this workaround applied, then the early return for a correct presumed_offset in this function meant we would not bind it into the GTT and the write would land somewhere else.
Fixes reproducible failures with GL_EXT_timer_query usage in apitrace, and I also expect it to fix the intermittent OQ issues on snb that danvet's been working on.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=48019
--- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/i915_gem_execbuffer.c +10 -10
@@ -117,6 +117,16 @@ i915_gem_execbuffer_relocate_entry(struct drm_i915_gem_object *obj, target_i915_obj =to_intel_bo (target_obj); target_offset = target_i915_obj->gtt_offset; +/* Sandybridge PPGTT errata: We need a global gtt mapping for MI and +* pipe_control writes because the gpu doesn't properly redirect them +* through the ppgtt for non_secure batchbuffers. */ +if (unlikely (IS_GEN6 (dev) && + reloc->write_domain ==I915_GEM_DOMAIN_INSTRUCTION && + !target_i915_obj->has_global_gtt_mapping)) { +i915_gem_gtt_bind_object (target_i915_obj, + target_i915_obj->cache_level); + } +/* The target buffer should have appeared before us in the * exec_object list, so it should have a GTT space bound by now. */
@@ -225,16 +235,6 @@ i915_gem_execbuffer_relocate_entry(struct drm_i915_gem_object *obj,io_mapping_unmap_atomic (reloc_page); } -/* Sandybridge PPGTT errata: We need a global gtt mapping for MI and -* pipe_control writes because the gpu doesn't properly redirect them -* through the ppgtt for non_secure batchbuffers. */ -if (unlikely (IS_GEN6 (dev) && - reloc->write_domain ==I915_GEM_DOMAIN_INSTRUCTION && - !target_i915_obj->has_global_gtt_mapping)) { -i915_gem_gtt_bind_object (target_i915_obj, - target_i915_obj->cache_level); - } -/* and update the user's relocation entry */ reloc->presumed_offset = target_offset;
Signature · 1 line
1.7.10.4
Daniel Vetter
AppliedQuoted 10 lines · Eric Anholt
If a buffer that was the target of a
PIPE_CONTROLfrom userland was a reused one that hadn't been evicted which had not previously had this workaround applied, then the early return for a correctpresumed_offsetin this function meant we would not bind it into the GTT and the write would land somewhere else.Fixes reproducible failures with
GL_EXT_timer_queryusage in apitrace, and I also expect it to fix the intermittent OQ issues on snb that danvet's been working on.
Quoted 5 lines
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=48019
Signed-off-by Eric Anholt <[email protected]>Reviewed-by Chris Wilson <[email protected]>Reviewed-by Carl Worth <[email protected]>Tested-by Carl Worth <[email protected]>
Picked up for -fixes, thanks for the patch. I've also added a bz line for #52932 to the commit.
I should have noticed this while banging against this particular wall, I guess I owe you a few beers for tracking it down ;-)
Cheers, Daniel
Signature · 3 lines
Daniel Vetter Mail: [email protected] Mobile: +41 (0)79 365 57 48