| Message ID | 20200211185008.30806-2-jose.souza@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2,1/2] drm/i915/mst: Set intel_dp_set_m_n() for MST slaves | expand |
On Tue, Feb 11, 2020 at 10:50:08AM -0800, José Roberto de Souza wrote: > The hotplug interruption detection was not being enabled for TC5 and > TC6 in the north detection side. TC5 and TC6 would be ports H & I. We're lacking handling in a few other places as well (e.g., aux channels). I sent patches to update some of those areas a few months back, but Lucas suggested that we just remove these ports completely since all TGL SKU's don't actually pin them out for use. For reference: https://lists.freedesktop.org/archives/intel-gfx/2019-October/217820.html I don't have strong feelings either way, but we should probably all agree on a direction and then handle it consistently everywhere in the code. Matt > > Cc: Matt Roper <matthew.d.roper@intel.com> > Signed-off-by: José Roberto de Souza <jose.souza@intel.com> > --- > drivers/gpu/drm/i915/i915_irq.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c > index 3d0cd0960bd2..abd979ef75ec 100644 > --- a/drivers/gpu/drm/i915/i915_irq.c > +++ b/drivers/gpu/drm/i915/i915_irq.c > @@ -3051,6 +3051,9 @@ static void gen11_hpd_detection_setup(struct drm_i915_private *dev_priv) > GEN11_HOTPLUG_CTL_ENABLE(PORT_TC2) | > GEN11_HOTPLUG_CTL_ENABLE(PORT_TC3) | > GEN11_HOTPLUG_CTL_ENABLE(PORT_TC4); > + if (INTEL_GEN(dev_priv) >= 12) > + hotplug |= 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); > @@ -3058,6 +3061,9 @@ static void gen11_hpd_detection_setup(struct drm_i915_private *dev_priv) > GEN11_HOTPLUG_CTL_ENABLE(PORT_TC2) | > GEN11_HOTPLUG_CTL_ENABLE(PORT_TC3) | > GEN11_HOTPLUG_CTL_ENABLE(PORT_TC4); > + if (INTEL_GEN(dev_priv) >= 12) > + hotplug |= GEN11_HOTPLUG_CTL_ENABLE(PORT_TC5) | > + GEN11_HOTPLUG_CTL_ENABLE(PORT_TC6); > I915_WRITE(GEN11_TBT_HOTPLUG_CTL, hotplug); > } > > -- > 2.25.0 >
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 3d0cd0960bd2..abd979ef75ec 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -3051,6 +3051,9 @@ static void gen11_hpd_detection_setup(struct drm_i915_private *dev_priv) GEN11_HOTPLUG_CTL_ENABLE(PORT_TC2) | GEN11_HOTPLUG_CTL_ENABLE(PORT_TC3) | GEN11_HOTPLUG_CTL_ENABLE(PORT_TC4); + if (INTEL_GEN(dev_priv) >= 12) + hotplug |= 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); @@ -3058,6 +3061,9 @@ static void gen11_hpd_detection_setup(struct drm_i915_private *dev_priv) GEN11_HOTPLUG_CTL_ENABLE(PORT_TC2) | GEN11_HOTPLUG_CTL_ENABLE(PORT_TC3) | GEN11_HOTPLUG_CTL_ENABLE(PORT_TC4); + if (INTEL_GEN(dev_priv) >= 12) + hotplug |= GEN11_HOTPLUG_CTL_ENABLE(PORT_TC5) | + GEN11_HOTPLUG_CTL_ENABLE(PORT_TC6); I915_WRITE(GEN11_TBT_HOTPLUG_CTL, hotplug); }
The hotplug interruption detection was not being enabled for TC5 and TC6 in the north detection side. Cc: Matt Roper <matthew.d.roper@intel.com> Signed-off-by: José Roberto de Souza <jose.souza@intel.com> --- drivers/gpu/drm/i915/i915_irq.c | 6 ++++++ 1 file changed, 6 insertions(+)