drm/i915: Don't ban default context when stop_rings!=0

If we've explicitly stopped the rings for testing purposes, don't ban
the default context. Fixes kms_flip hang tests.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Acked-by: Mika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 6978e692cd82d9cd86fd59fcbeaf46d183842782..0ec1080b19123d981cb7730810d80da0a724ddc2 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2255,14 +2255,13 @@ static bool i915_context_is_banned(struct drm_i915_private *dev_priv,
                return true;
 
        if (elapsed <= DRM_I915_CTX_BAN_PERIOD) {
-               if (dev_priv->gpu_error.stop_rings == 0 &&
-                   i915_gem_context_is_default(ctx)) {
-                       DRM_ERROR("gpu hanging too fast, banning!\n");
-               } else {
+               if (!i915_gem_context_is_default(ctx)) {
                        DRM_DEBUG("context hanging too fast, banning!\n");
+                       return true;
+               } else if (dev_priv->gpu_error.stop_rings == 0) {
+                       DRM_ERROR("gpu hanging too fast, banning!\n");
+                       return true;
                }
-
-               return true;
        }
 
        return false;