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

Testcase: igt/gem_eio/in-flight-suspend #vlv
Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
Cc: Imre Deak <imre.d...@intel.com>
Cc: Ville Syrjälä <ville.syrj...@linux.intel.com>
 drivers/gpu/drm/i915/i915_drv.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index f770be18b2d7..db6fc176ec3c 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -2462,10 +2462,13 @@ static void vlv_wait_for_gt_wells(struct 
drm_i915_private *dev_priv,
         * RC6 transitioning can be delayed up to 2 msec (see
         * valleyview_enable_rps), use 3 msec for safety.
+        *
+        * This can fail to turn off the rc6 if the GPU is stuck after a failed
+        * reset and we are trying to force the machine to sleep.
        if (vlv_wait_for_pw_status(dev_priv, mask, val))
-               DRM_ERROR("timeout waiting for GT wells to go %s\n",
-                         onoff(wait_for_on));
+               DRM_DEBUG_DRIVER("timeout waiting for GT wells to go %s\n",
+                                onoff(wait_for_on));
 static void vlv_check_no_gt_access(struct drm_i915_private *dev_priv)

Intel-gfx mailing list

Reply via email to