All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/i915/guc: Check for wedged before doing stuff
@ 2021-12-15 22:45 ` John.C.Harrison
  0 siblings, 0 replies; 8+ messages in thread
From: John.C.Harrison @ 2021-12-15 22:45 UTC (permalink / raw)
  To: Intel-GFX; +Cc: John Harrison, DRI-Devel

From: John Harrison <John.C.Harrison@Intel.com>

A fault injection probe test hit a BUG_ON in a GuC error path. It
showed that the GuC code could potentially attempt to do many things
when the device is actually wedged. So, add a check in to prevent that.

Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
---
 drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
index 97311119da6f..88f002c4d41b 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
@@ -1350,7 +1350,8 @@ submission_disabled(struct intel_guc *guc)
 	struct i915_sched_engine * const sched_engine = guc->sched_engine;
 
 	return unlikely(!sched_engine ||
-			!__tasklet_is_enabled(&sched_engine->tasklet));
+			!__tasklet_is_enabled(&sched_engine->tasklet) ||
+			test_bit(I915_WEDGED, &guc_to_gt(guc)->reset.flags));
 }
 
 static void disable_submission(struct intel_guc *guc)
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2021-12-17  9:10 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-15 22:45 [PATCH] drm/i915/guc: Check for wedged before doing stuff John.C.Harrison
2021-12-15 22:45 ` [Intel-gfx] " John.C.Harrison
2021-12-15 23:57 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
2021-12-16  1:05 ` [Intel-gfx] [PATCH] " Matthew Brost
2021-12-16  1:38 ` [Intel-gfx] ✗ Fi.CI.IGT: failure for " Patchwork
2021-12-16  8:47 ` [Intel-gfx] [PATCH] " Tvrtko Ursulin
2021-12-16 20:30   ` John Harrison
2021-12-17  9:10     ` Tvrtko Ursulin

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.