Commit 96a764d9 authored by Mika Kuoppala's avatar Mika Kuoppala Committed by Daniel Vetter
Browse files

drm/i915: remove i915_hangcheck_hung 



Rework of per ring hangcheck made this obsolete.

Signed-off-by: default avatarMika Kuoppala <mika.kuoppala@intel.com>
Reviewed-by: default avatarBen Widawsky <ben@bwidawsk.net>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 05407ff8

drivers/gpu/drm/i915/i915_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -842,7 +842,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;

drivers/gpu/drm/i915/i915_irq.c

+0 −21
Original line number Diff line number Diff line
@@ -2398,27 +2398,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