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

Commit 26a02b8f authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Make queueing the hangcheck work inline 



Since the function is a small wrapper around schedule_delayed_work(),
move it inline to remove the function call overhead for the principle
caller.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1467390209-3576-4-git-send-email-chris@chris-wilson.co.uk
parent 77740025

drivers/gpu/drm/i915/i915_drv.h

+17 −1
Original line number Diff line number Diff line
@@ -2932,7 +2932,23 @@ void intel_hpd_cancel_work(struct drm_i915_private *dev_priv); 
bool intel_hpd_pin_to_port(enum hpd_pin pin, enum port *port);



/* i915_irq.c */

void i915_queue_hangcheck(struct drm_i915_private *dev_priv);

static inline void i915_queue_hangcheck(struct drm_i915_private *dev_priv)

{

	unsigned long delay;



	if (unlikely(!i915.enable_hangcheck))

		return;



	/* Don't continually defer the hangcheck so that it is always run at

	 * least once after work has been scheduled on any ring. Otherwise,

	 * we will ignore a hung ring if a second ring is kept busy.

	 */



	delay = round_jiffies_up_relative(DRM_I915_HANGCHECK_JIFFIES);

	queue_delayed_work(system_long_wq,

			   &dev_priv->gpu_error.hangcheck_work, delay);

}



__printf(3, 4)

void i915_handle_error(struct drm_i915_private *dev_priv,

		       u32 engine_mask,

drivers/gpu/drm/i915/i915_irq.c

+0 −17
Original line number Diff line number Diff line
@@ -3247,23 +3247,6 @@ static void i915_hangcheck_elapsed(struct work_struct *work) 
	ENABLE_RPM_WAKEREF_ASSERTS(dev_priv);

}



void i915_queue_hangcheck(struct drm_i915_private *dev_priv)

{

	unsigned long delay;



	if (!i915.enable_hangcheck)

		return;



	/* Don't continually defer the hangcheck so that it is always run at

	 * least once after work has been scheduled on any ring. Otherwise,

	 * we will ignore a hung ring if a second ring is kept busy.

	 */



	delay = round_jiffies_up_relative(DRM_I915_HANGCHECK_JIFFIES);

	queue_delayed_work(system_long_wq,

			   &dev_priv->gpu_error.hangcheck_work, delay);

}



static void ibx_irq_reset(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;