On Thu, 22 Sep 2022, Gustavo Sousa <[email protected]> wrote: > Use *_hpd_invert() helpers whenever possible to isolate logic specific > to hotplug inversion from common HPD setup logic to improve readability > and maintainability of the source code. > > While we only define dg1_hpd_invert() here, future platforms are likely > to have different hotplug inversion needs, thus it makes sense grouping > different implementations under a common suffix. > > v2: Fix coding style and prefer to use small *_hdp_invert() helpers > instead of a generic one. > > CC: Jani Nikula <[email protected]> > CC: Lucas De Marchi <[email protected]> > Signed-off-by: Gustavo Sousa <[email protected]>
Reviewed-by: Jani Nikula <[email protected]> > --- > drivers/gpu/drm/i915/i915_irq.c | 19 ++++++++++--------- > 1 file changed, 10 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c > index de06f293e173..87cb05b3b6ce 100644 > --- a/drivers/gpu/drm/i915/i915_irq.c > +++ b/drivers/gpu/drm/i915/i915_irq.c > @@ -3411,17 +3411,18 @@ static u32 gen11_hotplug_enables(struct > drm_i915_private *i915, > } > } > > +static void dg1_hpd_invert(struct drm_i915_private *i915) > +{ > + u32 val = (INVERT_DDIA_HPD | > + INVERT_DDIB_HPD | > + INVERT_DDIC_HPD | > + INVERT_DDID_HPD); > + intel_uncore_rmw(&i915->uncore, SOUTH_CHICKEN1, 0, val); > +} > + > static void dg1_hpd_irq_setup(struct drm_i915_private *dev_priv) > { > - u32 val; > - > - val = intel_uncore_read(&dev_priv->uncore, SOUTH_CHICKEN1); > - val |= (INVERT_DDIA_HPD | > - INVERT_DDIB_HPD | > - INVERT_DDIC_HPD | > - INVERT_DDID_HPD); > - intel_uncore_write(&dev_priv->uncore, SOUTH_CHICKEN1, val); > - > + dg1_hpd_invert(dev_priv); > icp_hpd_irq_setup(dev_priv); > } -- Jani Nikula, Intel Open Source Graphics Center
