[Intel-gfx] [PATCH 2/2] drm/i915/ringbuffer: Move all default irq vfuncs init to a separate func

[Tvrtko Ursulin]

On 01/07/16 09:18, Chris Wilson wrote:
> Just plonk all the default irq vfuncs together in one function to keep
> the initialisers of reasonable size.
>
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
> ---
>   drivers/gpu/drm/i915/intel_ringbuffer.c | 43 ++++++++++++++++++---------------
>   1 file changed, 24 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
> index caebe812d10f..24cdc920f4b4 100644
> --- a/drivers/gpu/drm/i915/intel_ringbuffer.c
> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
> @@ -2983,6 +2983,29 @@ static void intel_ring_init_semaphores(struct drm_i915_private *dev_priv,
>   	}
>   }
>
> +static void intel_ring_init_irq(struct drm_i915_private *dev_priv,
> +				struct intel_engine_cs *engine)
> +{
> +	if (INTEL_GEN(dev_priv) >= 8) {
> +		engine->irq_get = gen8_ring_get_irq;
> +		engine->irq_put = gen8_ring_put_irq;
> +		engine->irq_seqno_barrier = gen6_seqno_barrier;
> +	} else if (INTEL_GEN(dev_priv) >= 6) {
> +		engine->irq_get = gen6_ring_get_irq;
> +		engine->irq_put = gen6_ring_put_irq;
> +		engine->irq_seqno_barrier = gen6_seqno_barrier;
> +	} else if (INTEL_GEN(dev_priv) >= 5) {
> +		engine->irq_get = gen5_ring_get_irq;
> +		engine->irq_put = gen5_ring_put_irq;
> +	} else if (INTEL_GEN(dev_priv) >= 3) {
> +		engine->irq_get = i9xx_ring_get_irq;
> +		engine->irq_put = i9xx_ring_put_irq;
> +	} else {
> +		engine->irq_get = i8xx_ring_get_irq;
> +		engine->irq_put = i8xx_ring_put_irq;
> +	}
> +}
> +
>   static void intel_ring_default_vfuncs(struct drm_i915_private *dev_priv,
>   				      struct intel_engine_cs *engine)
>   {
> @@ -3006,25 +3029,7 @@ static void intel_ring_default_vfuncs(struct drm_i915_private *dev_priv,
>   	else
>   		engine->dispatch_execbuffer = i915_dispatch_execbuffer;
>
> -	if (INTEL_GEN(dev_priv) >= 8) {
> -		engine->irq_get = gen8_ring_get_irq;
> -		engine->irq_put = gen8_ring_put_irq;
> -		engine->irq_seqno_barrier = gen6_seqno_barrier;
> -	} else if (INTEL_GEN(dev_priv) >= 6) {
> -		engine->irq_get = gen6_ring_get_irq;
> -		engine->irq_put = gen6_ring_put_irq;
> -		engine->irq_seqno_barrier = gen6_seqno_barrier;
> -	} else if (INTEL_GEN(dev_priv) >= 5) {
> -		engine->irq_get = gen5_ring_get_irq;
> -		engine->irq_put = gen5_ring_put_irq;
> -	} else if (INTEL_GEN(dev_priv) >= 3) {
> -		engine->irq_get = i9xx_ring_get_irq;
> -		engine->irq_put = i9xx_ring_put_irq;
> -	} else {
> -		engine->irq_get = i8xx_ring_get_irq;
> -		engine->irq_put = i8xx_ring_put_irq;
> -	}
> -
> +	intel_ring_init_irq(dev_priv, engine);
>   	intel_ring_init_semaphores(dev_priv, engine);
>   }
>
>

Yes thats better.

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

Regards,

Tvrtko