[Intel-gfx] [CI 05/20] drm/i915: Make queueing the hangcheck work inline

[Tvrtko Ursulin]

On 19/05/16 12:32, Chris Wilson wrote:
> Since the function is a small wrapper around schedule_delayed_work(),
> move it inline to remove the function call overhead for the principle
> caller.

Alternatively move it to i915_gem.c and let the compiler decide?

But it is small enough, so anyway:

Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin at intel.com>

Regards,

Tvrtko


> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> ---
>   drivers/gpu/drm/i915/i915_drv.h | 17 ++++++++++++++++-
>   drivers/gpu/drm/i915/i915_irq.c | 16 ----------------
>   2 files changed, 16 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 42b8038bf998..33553ea99a03 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -2833,7 +2833,22 @@ 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);
> +	schedule_delayed_work(&dev_priv->gpu_error.hangcheck_work, delay);
> +}
> +
>   __printf(3, 4)
>   void i915_handle_error(struct drm_i915_private *dev_priv,
>   		       u32 engine_mask,
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index 984b575ba081..27dd45a7291c 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -3260,22 +3260,6 @@ out:
>   	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);
> -	schedule_delayed_work(&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;
>