Re: [PATCH 5/5] drm/i915: remove i915_hangcheck_hung

[Ben Widawsky <ben@bwidawsk.net>]

On Mon, May 13, 2013 at 04:32:13PM +0300, Mika Kuoppala wrote:
> Rework of per ring hangcheck made this obsolete.
> 
>
>
Probably could have put this in the last patch. Assuming you add the
comment on #4, and Daniel/Chris are okay with the proposed functional
change, 4 & 5 are:
Reviewed-by: Ben Widawsky <ben@bwidawsk.net>

> Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
> ---
>  drivers/gpu/drm/i915/i915_drv.h |    1 -
>  drivers/gpu/drm/i915/i915_irq.c |   21 ---------------------
>  2 files changed, 22 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index db7cda9..3161d33 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -833,7 +833,6 @@ struct i915_gpu_error {
>  #define DRM_I915_HANGCHECK_PERIOD 1500 /* in ms */
>  #define DRM_I915_HANGCHECK_JIFFIES msecs_to_jiffies(DRM_I915_HANGCHECK_PERIOD)
>  	struct timer_list hangcheck_timer;
> -	int hangcheck_count;
>  
>  	/* For reset and error_state handling. */
>  	spinlock_t lock;
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index 5dde61f..f204d83 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -2357,27 +2357,6 @@ static bool i915_hangcheck_ring_hung(struct intel_ring_buffer *ring)
>  	return !kick_ring(ring);
>  }
>  
> -static bool i915_hangcheck_hung(struct drm_device *dev)
> -{
> -	drm_i915_private_t *dev_priv = dev->dev_private;
> -
> -	if (dev_priv->gpu_error.hangcheck_count++ > 1) {
> -		bool hung = true;
> -		struct intel_ring_buffer *ring;
> -		int i;
> -
> -		DRM_ERROR("Hangcheck timer elapsed... GPU hung\n");
> -		i915_handle_error(dev, true);
> -
> -		for_each_ring(ring, dev_priv, i)
> -			hung &= i915_hangcheck_ring_hung(ring);
> -
> -		return hung;
> -	}
> -
> -	return false;
> -}
> -
>  /**
>   * This is called when the chip hasn't reported back with completed
>   * batchbuffers in a long time. We keep track per ring seqno progress and
> -- 
> 1.7.9.5
> 

-- 
Ben Widawsky, Intel Open Source Technology Center