Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ccc7bed0 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

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: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Acked-by: default avatarMika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent f103fc7d

drivers/gpu/drm/i915/i915_gem.c

+5 −6
Original line number Diff line number Diff line
@@ -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 false;