| Message ID | 20200630215601.28557-8-ville.syrjala@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: Futher hotplug cleanups | expand |
On Wed, 2020-07-01 at 00:55 +0300, Ville Syrjala wrote: > From: Ville Syrjälä < > ville.syrjala@linux.intel.com > > > > gen11_hpd_detection_setup() is missing ports TC5/6. Add them. > > TODO: Might be nice to only enable the hpd detection logic > for ports we actually have. Should be rolled out for all > platforms if/when done... TC5 and TC6 don't exist in ICL but this is not a reserved register, should not cause any harm. Reviewed-by: José Roberto de Souza <jose.souza@intel.com> > > Signed-off-by: Ville Syrjälä < > ville.syrjala@linux.intel.com > > > --- > drivers/gpu/drm/i915/i915_irq.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c > index ad52109c747d..839ae674bc44 100644 > --- a/drivers/gpu/drm/i915/i915_irq.c > +++ b/drivers/gpu/drm/i915/i915_irq.c > @@ -3109,14 +3109,18 @@ static void gen11_hpd_detection_setup(struct drm_i915_private *dev_priv) > hotplug |= GEN11_HOTPLUG_CTL_ENABLE(PORT_TC1) | > GEN11_HOTPLUG_CTL_ENABLE(PORT_TC2) | > GEN11_HOTPLUG_CTL_ENABLE(PORT_TC3) | > - GEN11_HOTPLUG_CTL_ENABLE(PORT_TC4); > + GEN11_HOTPLUG_CTL_ENABLE(PORT_TC4) | > + GEN11_HOTPLUG_CTL_ENABLE(PORT_TC5) | > + GEN11_HOTPLUG_CTL_ENABLE(PORT_TC6); > I915_WRITE(GEN11_TC_HOTPLUG_CTL, hotplug); > > hotplug = I915_READ(GEN11_TBT_HOTPLUG_CTL); > hotplug |= GEN11_HOTPLUG_CTL_ENABLE(PORT_TC1) | > GEN11_HOTPLUG_CTL_ENABLE(PORT_TC2) | > GEN11_HOTPLUG_CTL_ENABLE(PORT_TC3) | > - GEN11_HOTPLUG_CTL_ENABLE(PORT_TC4); > + GEN11_HOTPLUG_CTL_ENABLE(PORT_TC4) | > + GEN11_HOTPLUG_CTL_ENABLE(PORT_TC5) | > + GEN11_HOTPLUG_CTL_ENABLE(PORT_TC6); > I915_WRITE(GEN11_TBT_HOTPLUG_CTL, hotplug); > } > >
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index ad52109c747d..839ae674bc44 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -3109,14 +3109,18 @@ static void gen11_hpd_detection_setup(struct drm_i915_private *dev_priv) hotplug |= GEN11_HOTPLUG_CTL_ENABLE(PORT_TC1) | GEN11_HOTPLUG_CTL_ENABLE(PORT_TC2) | GEN11_HOTPLUG_CTL_ENABLE(PORT_TC3) | - GEN11_HOTPLUG_CTL_ENABLE(PORT_TC4); + GEN11_HOTPLUG_CTL_ENABLE(PORT_TC4) | + GEN11_HOTPLUG_CTL_ENABLE(PORT_TC5) | + GEN11_HOTPLUG_CTL_ENABLE(PORT_TC6); I915_WRITE(GEN11_TC_HOTPLUG_CTL, hotplug); hotplug = I915_READ(GEN11_TBT_HOTPLUG_CTL); hotplug |= GEN11_HOTPLUG_CTL_ENABLE(PORT_TC1) | GEN11_HOTPLUG_CTL_ENABLE(PORT_TC2) | GEN11_HOTPLUG_CTL_ENABLE(PORT_TC3) | - GEN11_HOTPLUG_CTL_ENABLE(PORT_TC4); + GEN11_HOTPLUG_CTL_ENABLE(PORT_TC4) | + GEN11_HOTPLUG_CTL_ENABLE(PORT_TC5) | + GEN11_HOTPLUG_CTL_ENABLE(PORT_TC6); I915_WRITE(GEN11_TBT_HOTPLUG_CTL, hotplug); }