| Message ID | 20201006185809.4655-3-ville.syrjala@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/3] drm/i915: Reorder hpd init vs. display resume | expand |
On Tue, Oct 06, 2020 at 09:58:09PM +0300, Ville Syrjala wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Add a small wrapper for .hpd_irq_setup() which does the > "do we even have the hook?" and "are display interrupts enabled?" > checks. > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Imre Deak <imre.deak@intel.com> > --- > drivers/gpu/drm/i915/display/intel_hotplug.c | 22 +++++++++++--------- > 1 file changed, 12 insertions(+), 10 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_hotplug.c b/drivers/gpu/drm/i915/display/intel_hotplug.c > index 5c58c1ed6493..6110d71b4f14 100644 > --- a/drivers/gpu/drm/i915/display/intel_hotplug.c > +++ b/drivers/gpu/drm/i915/display/intel_hotplug.c > @@ -213,6 +213,12 @@ 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->display.hpd_irq_setup) > + i915->display.hpd_irq_setup(i915); > +} > + > static void intel_hpd_irq_storm_reenable_work(struct work_struct *work) > { > struct drm_i915_private *dev_priv = > @@ -248,8 +254,7 @@ static void intel_hpd_irq_storm_reenable_work(struct work_struct *work) > dev_priv->hotplug.stats[pin].state = HPD_ENABLED; > } > > - if (dev_priv->display_irqs_enabled && dev_priv->display.hpd_irq_setup) > - dev_priv->display.hpd_irq_setup(dev_priv); > + intel_hpd_irq_setup(dev_priv); > > spin_unlock_irq(&dev_priv->irq_lock); > > @@ -556,8 +561,8 @@ void intel_hpd_irq_handler(struct drm_i915_private *dev_priv, > * Disable any IRQs that storms were detected on. Polling enablement > * happens later in our hotplug work. > */ > - if (storm_detected && dev_priv->display_irqs_enabled) > - dev_priv->display.hpd_irq_setup(dev_priv); > + if (storm_detected) > + intel_hpd_irq_setup(dev_priv); > spin_unlock(&dev_priv->irq_lock); > > /* > @@ -602,12 +607,9 @@ void intel_hpd_init(struct drm_i915_private *dev_priv) > * Interrupt setup is already guaranteed to be single-threaded, this is > * just to make the assert_spin_locked checks happy. > */ > - if (dev_priv->display_irqs_enabled && dev_priv->display.hpd_irq_setup) { > - spin_lock_irq(&dev_priv->irq_lock); > - if (dev_priv->display_irqs_enabled) > - dev_priv->display.hpd_irq_setup(dev_priv); > - spin_unlock_irq(&dev_priv->irq_lock); > - } > + spin_lock_irq(&dev_priv->irq_lock); > + intel_hpd_irq_setup(dev_priv); > + spin_unlock_irq(&dev_priv->irq_lock); > } > > static void i915_hpd_poll_init_work(struct work_struct *work) > -- > 2.26.2 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/display/intel_hotplug.c b/drivers/gpu/drm/i915/display/intel_hotplug.c index 5c58c1ed6493..6110d71b4f14 100644 --- a/drivers/gpu/drm/i915/display/intel_hotplug.c +++ b/drivers/gpu/drm/i915/display/intel_hotplug.c @@ -213,6 +213,12 @@ 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->display.hpd_irq_setup) + i915->display.hpd_irq_setup(i915); +} + static void intel_hpd_irq_storm_reenable_work(struct work_struct *work) { struct drm_i915_private *dev_priv = @@ -248,8 +254,7 @@ static void intel_hpd_irq_storm_reenable_work(struct work_struct *work) dev_priv->hotplug.stats[pin].state = HPD_ENABLED; } - if (dev_priv->display_irqs_enabled && dev_priv->display.hpd_irq_setup) - dev_priv->display.hpd_irq_setup(dev_priv); + intel_hpd_irq_setup(dev_priv); spin_unlock_irq(&dev_priv->irq_lock); @@ -556,8 +561,8 @@ void intel_hpd_irq_handler(struct drm_i915_private *dev_priv, * Disable any IRQs that storms were detected on. Polling enablement * happens later in our hotplug work. */ - if (storm_detected && dev_priv->display_irqs_enabled) - dev_priv->display.hpd_irq_setup(dev_priv); + if (storm_detected) + intel_hpd_irq_setup(dev_priv); spin_unlock(&dev_priv->irq_lock); /* @@ -602,12 +607,9 @@ void intel_hpd_init(struct drm_i915_private *dev_priv) * Interrupt setup is already guaranteed to be single-threaded, this is * just to make the assert_spin_locked checks happy. */ - if (dev_priv->display_irqs_enabled && dev_priv->display.hpd_irq_setup) { - spin_lock_irq(&dev_priv->irq_lock); - if (dev_priv->display_irqs_enabled) - dev_priv->display.hpd_irq_setup(dev_priv); - spin_unlock_irq(&dev_priv->irq_lock); - } + spin_lock_irq(&dev_priv->irq_lock); + intel_hpd_irq_setup(dev_priv); + spin_unlock_irq(&dev_priv->irq_lock); } static void i915_hpd_poll_init_work(struct work_struct *work)