Skip to content

Commit 831ebf1

Browse files
committed
drm/i915: Suppress the "Failed to idle" warning for gem_eio
It is debatable whether having an error message on suspend for forcibly cancelling outstanding work is worthwhile. We want to know if it occurs in the wild (as we will then have to reconsider the approach!), but equally is not fatal across suspend, as upon resume we automatically clear the wedged status. However, CI does trigger this scenario with gem_eio/suspend; as there we are intentionally wedging the device upon suspend. The dilemma is how not to trigger a failure report for the dmesg spam, for which the quickest response is to suppress the warning in the kernel. I'd rather mark it as accepted in gem_eio, but for now detecting when gem_eio is playing games and cancelling the warning for that case seems a barely acceptable hack. Testcase: igt/gem_eio/suspend Reference: 5861b01 ("drm/i915: Do a synchronous switch-to-kernel-context on idling") Signed-off-by: Chris Wilson <[email protected]> Cc: Tvrtko Ursulin <[email protected]> Reviewed-by: Tvrtko Ursulin <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 8f6e87d commit 831ebf1

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

drivers/gpu/drm/i915/i915_gem.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2848,10 +2848,13 @@ static bool switch_to_kernel_context_sync(struct drm_i915_private *i915,
28482848
result = false;
28492849

28502850
if (!result) {
2851+
if (i915_modparams.reset) { /* XXX hide warning from gem_eio */
2852+
dev_err(i915->drm.dev,
2853+
"Failed to idle engines, declaring wedged!\n");
2854+
GEM_TRACE_DUMP();
2855+
}
2856+
28512857
/* Forcibly cancel outstanding work and leave the gpu quiet. */
2852-
dev_err(i915->drm.dev,
2853-
"Failed to idle engines, declaring wedged!\n");
2854-
GEM_TRACE_DUMP();
28552858
i915_gem_set_wedged(i915);
28562859
}
28572860

0 commit comments

Comments
 (0)