[Intel-gfx] [PATCH 7/8] drm/i915: move display-related to the end of intel_irq_init()

[Souza, Jose]

On Fri, 2020-11-06 at 14:55 -0800, Lucas De Marchi wrote:
> In intel_irq_init() move what's display/hpd related after what is gt and
> guc. This makes it easier to support !HAS_DISPLAY() in future.

Reviewed-by: José Roberto de Souza <jose.souza at intel.com>

> 
> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>
> ---
>  drivers/gpu/drm/i915/i915_irq.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index 2ab4edf7f25c..4faf7cb9c158 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -4204,10 +4204,6 @@ void intel_irq_init(struct drm_i915_private *dev_priv)
>  	struct drm_device *dev = &dev_priv->drm;
>  	int i;
>  
> 
> 
> 
> -	intel_hpd_init_pins(dev_priv);
> -
> -	intel_hpd_init_work(dev_priv);
> -
>  	INIT_WORK(&dev_priv->l3_parity.error_work, ivb_parity_work);
>  	for (i = 0; i < MAX_L3_SLICES; ++i)
>  		dev_priv->l3_parity.remap_info[i] = NULL;
> @@ -4216,6 +4212,10 @@ void intel_irq_init(struct drm_i915_private *dev_priv)
>  	if (HAS_GT_UC(dev_priv) && INTEL_GEN(dev_priv) < 11)
>  		dev_priv->gt.pm_guc_events = GUC_INTR_GUC2HOST << 16;
>  
> 
> 
> 
> +	intel_hpd_init_pins(dev_priv);
> +
> +	intel_hpd_init_work(dev_priv);
> +
>  	dev->vblank_disable_immediate = true;
>  
> 
> 
> 
>  	/* Most platforms treat the display irq block as an always-on