Re: [PATCH] drm/i915: Don't ban default context when stop_rings!=0

From: Mika Kuoppala <mika.kuoppala@linux.intel.com>
To: ville.syrjala@linux.intel.com, intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915: Don't ban default context when stop_rings!=0
Date: Fri, 21 Feb 2014 18:30:56 +0200	[thread overview]
Message-ID: <87bny0ig1r.fsf@gaia.fi.intel.com> (raw)
In-Reply-To: <1392992807-25806-1-git-send-email-ville.syrjala@linux.intel.com>

ville.syrjala@linux.intel.com writes:

> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> 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>
> ---
> I'm not sure this is what we want in general, but it's what kms_flip expects
> currently.

Acked-by: Mika Kuoppala <mika.kuoppala@intel.com>

>  drivers/gpu/drm/i915/i915_gem.c | 11 +++++------
>  1 file changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index 3618bb0..52f9ea7 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -2259,14 +2259,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;
> -- 
> 1.8.3.2
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx