| Message ID | 20191125125313.17584-2-kai.vehmanen@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2,1/2] drm/i915/dp: fix DP audio for PORT_A on gen12+ | expand |
On Mon, Nov 25, 2019 at 02:53:13PM +0200, Kai Vehmanen wrote: > Starting with gen12, PORT_A can be also connected to DP > transcoder. Update code in intel_dp_init() to take this > into account. > > Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com> I don't think this function gets called on gen12; this one is for pre-DDI platforms. DP initialization on recent platforms happens via intel_ddi_init() and that one calls intel_infoframe_init without the PORT_A restriction. Matt > --- > drivers/gpu/drm/i915/display/intel_dp.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c > index 4519c32f6c24..fd2b39fe0e60 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@ -7335,7 +7335,7 @@ bool intel_dp_init(struct drm_i915_private *dev_priv, > > intel_dig_port->hpd_pulse = intel_dp_hpd_pulse; > > - if (port != PORT_A) > + if (port != PORT_A || INTEL_GEN(dev_priv) >= 12) > intel_infoframe_init(intel_dig_port); > > intel_dig_port->aux_ch = intel_bios_port_aux_ch(dev_priv, port); > -- > 2.17.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Hi, On Tue, 26 Nov 2019, Matt Roper wrote: > On Mon, Nov 25, 2019 at 02:53:13PM +0200, Kai Vehmanen wrote: > > Starting with gen12, PORT_A can be also connected to DP > > transcoder. Update code in intel_dp_init() to take this > > into account. > > I don't think this function gets called on gen12; this one is for > pre-DDI platforms. DP initialization on recent platforms happens via > intel_ddi_init() and that one calls intel_infoframe_init without the > PORT_A restriction. aa, ok. Thanks for the reviews! I was doing a mechanical check for all logic for PORT_A that assumed it cannot be connected to DP/HDMI, and didn't check the full call chain. But yeah, if this function never gets called on gen12, then this is a non-issue and patch an be dropped. Br, Kai
diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 4519c32f6c24..fd2b39fe0e60 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -7335,7 +7335,7 @@ bool intel_dp_init(struct drm_i915_private *dev_priv, intel_dig_port->hpd_pulse = intel_dp_hpd_pulse; - if (port != PORT_A) + if (port != PORT_A || INTEL_GEN(dev_priv) >= 12) intel_infoframe_init(intel_dig_port); intel_dig_port->aux_ch = intel_bios_port_aux_ch(dev_priv, port);
Starting with gen12, PORT_A can be also connected to DP transcoder. Update code in intel_dp_init() to take this into account. Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com> --- drivers/gpu/drm/i915/display/intel_dp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)