On Wed, 08 Sep 2021, Dave Airlie <airlied@xxxxxxxxx> wrote:
> From: Dave Airlie <airlied@xxxxxxxxxx>
>
> Use a macro to avoid mistakes, this type of macro is only used
> in a couple of places.
> ---
> drivers/gpu/drm/i915/display/intel_hotplug.c | 4 +--
> drivers/gpu/drm/i915/i915_drv.h | 2 +-
> drivers/gpu/drm/i915/i915_irq.c | 27 +++++++++++++++-----
> 3 files changed, 23 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_hotplug.c b/drivers/gpu/drm/i915/display/intel_hotplug.c
> index a06e1e1b33e1..97df40107213 100644
> --- a/drivers/gpu/drm/i915/display/intel_hotplug.c
> +++ b/drivers/gpu/drm/i915/display/intel_hotplug.c
> @@ -215,8 +215,8 @@ intel_hpd_irq_storm_switch_to_polling(struct drm_i915_private *dev_priv)
>
> static void intel_hpd_irq_setup(struct drm_i915_private *i915)
> {
> - if (i915->display_irqs_enabled && i915->irq_funcs.hpd_irq_setup)
> - i915->irq_funcs.hpd_irq_setup(i915);
> + if (i915->display_irqs_enabled && i915->irq_funcs)
> + i915->irq_funcs->hpd_irq_setup(i915);
> }
>
> static void intel_hpd_irq_storm_reenable_work(struct work_struct *work)
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index b3765222e717..6050bb519b18 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -1003,7 +1003,7 @@ struct drm_i915_private {
> struct drm_i915_wm_disp_funcs wm_disp;
>
> /* irq display functions */
> - struct drm_i915_irq_funcs irq_funcs;
> + const struct drm_i915_irq_funcs *irq_funcs;
>
> /* fdi display functions */
> const struct drm_i915_fdi_link_train_funcs *fdi_funcs;
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index f515a3a76a8e..29231daf6057 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -4345,6 +4345,19 @@ static irqreturn_t i965_irq_handler(int irq, void *arg)
> return ret;
> }
>
> +#define HPD_FUNCS(platform) \
> +static const struct drm_i915_irq_funcs platform##_hpd_funcs = { \
> + .hpd_irq_setup = platform##_hpd_irq_setup \
> +}
> +
> +HPD_FUNCS(i915);
> +HPD_FUNCS(dg1);
> +HPD_FUNCS(gen11);
> +HPD_FUNCS(bxt);
> +HPD_FUNCS(icp);
> +HPD_FUNCS(spt);
> +HPD_FUNCS(ilk);
> +
#undef HPD_FUNCS
Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx>
> /**
> * intel_irq_init - initializes irq support
> * @dev_priv: i915 device instance
> @@ -4395,20 +4408,20 @@ void intel_irq_init(struct drm_i915_private *dev_priv)
>
> if (HAS_GMCH(dev_priv)) {
> if (I915_HAS_HOTPLUG(dev_priv))
> - dev_priv->irq_funcs.hpd_irq_setup = i915_hpd_irq_setup;
> + dev_priv->irq_funcs = &i915_hpd_funcs;
> } else {
> if (HAS_PCH_DG1(dev_priv))
> - dev_priv->irq_funcs.hpd_irq_setup = dg1_hpd_irq_setup;
> + dev_priv->irq_funcs = &dg1_hpd_funcs;
> else if (DISPLAY_VER(dev_priv) >= 11)
> - dev_priv->irq_funcs.hpd_irq_setup = gen11_hpd_irq_setup;
> + dev_priv->irq_funcs = &gen11_hpd_funcs;
> else if (IS_GEMINILAKE(dev_priv) || IS_BROXTON(dev_priv))
> - dev_priv->irq_funcs.hpd_irq_setup = bxt_hpd_irq_setup;
> + dev_priv->irq_funcs = &bxt_hpd_funcs;
> else if (INTEL_PCH_TYPE(dev_priv) >= PCH_ICP)
> - dev_priv->irq_funcs.hpd_irq_setup = icp_hpd_irq_setup;
> + dev_priv->irq_funcs = &icp_hpd_funcs;
> else if (INTEL_PCH_TYPE(dev_priv) >= PCH_SPT)
> - dev_priv->irq_funcs.hpd_irq_setup = spt_hpd_irq_setup;
> + dev_priv->irq_funcs = &spt_hpd_funcs;
> else
> - dev_priv->irq_funcs.hpd_irq_setup = ilk_hpd_irq_setup;
> + dev_priv->irq_funcs = &ilk_hpd_funcs;
> }
> }
--
Jani Nikula, Intel Open Source Graphics Center
