diff mbox

drm/i915: Don't set fence errors on non-guilty requests

Message ID 20170720175901.30884-1-daniel.vetter@ffwll.ch (mailing list archive)
State New, archived
Headers show

Commit Message

Daniel Vetter July 20, 2017, 5:59 p.m. UTC
... at least not in that place, because this can also fire for
requests which have completed. Which then hits the assert in
dma_fence_set_error.

Since I'm not really clear what should be done here I pinged Chris,
and he suggested we simply remove this for now.

Found while stress-testing gpu reset using kms_busy, with about 0-3
hits of it per complete run on my snb here.

Testcase: igt/kms_busy.
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 drivers/gpu/drm/i915/i915_gem.c | 1 -
 1 file changed, 1 deletion(-)

Comments

Chris Wilson July 20, 2017, 6:25 p.m. UTC | #1
Quoting Daniel Vetter (2017-07-20 18:59:01)
> ... at least not in that place, because this can also fire for
> requests which have completed. Which then hits the assert in
> dma_fence_set_error.
> 
> Since I'm not really clear what should be done here I pinged Chris,
> and he suggested we simply remove this for now.

My idea was the patch this morning to shuffle engine_stalled around as
we are no longer getting here for innocent engines.
https://patchwork.freedesktop.org/patch/168056/
-Chris
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 1a8842f143fc..1c7453e2cc45 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2955,7 +2955,6 @@  static bool i915_gem_reset_request(struct drm_i915_gem_request *request)
 		skip_request(request);
 	} else {
 		i915_gem_context_mark_innocent(request->ctx);
-		dma_fence_set_error(&request->fence, -EAGAIN);
 	}
 
 	return guilty;