Skip to content

Commit e01569a

Browse files
committed
drm/i915: Silence debugging DRM_ERROR for failing to suspend vlv powerwells
If we try to suspend a wedged device following a GPU reset failure, we will also fail to turn off the rc6 powerwells (on vlv), leading to a *ERROR*. This is quite expected in this case, so the best we can do is shake our heads and reduce the *ERROR* to a debug so CI stops complaining. Testcase: igt/gem_eio/in-flight-suspend #vlv Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105583 Signed-off-by: Chris Wilson <[email protected]> Cc: Imre Deak <[email protected]> Cc: Ville Syrjälä <[email protected]> Acked-by: Jani Nikula <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent b9b7742 commit e01569a

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

drivers/gpu/drm/i915/i915_drv.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2468,10 +2468,13 @@ static void vlv_wait_for_gt_wells(struct drm_i915_private *dev_priv,
24682468
/*
24692469
* RC6 transitioning can be delayed up to 2 msec (see
24702470
* valleyview_enable_rps), use 3 msec for safety.
2471+
*
2472+
* This can fail to turn off the rc6 if the GPU is stuck after a failed
2473+
* reset and we are trying to force the machine to sleep.
24712474
*/
24722475
if (vlv_wait_for_pw_status(dev_priv, mask, val))
2473-
DRM_ERROR("timeout waiting for GT wells to go %s\n",
2474-
onoff(wait_for_on));
2476+
DRM_DEBUG_DRIVER("timeout waiting for GT wells to go %s\n",
2477+
onoff(wait_for_on));
24752478
}
24762479

24772480
static void vlv_check_no_gt_access(struct drm_i915_private *dev_priv)

0 commit comments

Comments
 (0)