On Wed, 18 Oct 2023, Ville Syrjala <ville.syrjala@xxxxxxxxxxxxxxx> wrote: > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > Since we're asked to disable FECSTALL_DIS_DPTSTREAM_DPTTG when > the transcoder is disabled it seems prudent to also clear it > when enabliing the transcoder w/o FEC, just in case > someone else left it enabled by mistake. > > Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx> > --- > drivers/gpu/drm/i915/display/intel_dp_mst.c | 14 ++++++++------ > 1 file changed, 8 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c > index 3c66a3e3cc5e..38ad81d3bbe6 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c > +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c > @@ -817,12 +817,14 @@ static void intel_mst_enable_dp(struct intel_atomic_state *state, > drm_dp_add_payload_part2(&intel_dp->mst_mgr, &state->base, > drm_atomic_get_mst_payload_state(mst_state, connector->port)); > > - if (DISPLAY_VER(dev_priv) >= 14 && pipe_config->fec_enable) > - intel_de_rmw(dev_priv, MTL_CHICKEN_TRANS(trans), 0, > - FECSTALL_DIS_DPTSTREAM_DPTTG); > - else if (DISPLAY_VER(dev_priv) >= 12 && pipe_config->fec_enable) > - intel_de_rmw(dev_priv, CHICKEN_TRANS(trans), 0, > - FECSTALL_DIS_DPTSTREAM_DPTTG); > + if (DISPLAY_VER(dev_priv) >= 14) > + intel_de_rmw(dev_priv, MTL_CHICKEN_TRANS(trans), > + FECSTALL_DIS_DPTSTREAM_DPTTG, > + pipe_config->fec_enable ? FECSTALL_DIS_DPTSTREAM_DPTTG : 0); > + else if (DISPLAY_VER(dev_priv) >= 12) > + intel_de_rmw(dev_priv, CHICKEN_TRANS(trans), > + FECSTALL_DIS_DPTSTREAM_DPTTG, > + pipe_config->fec_enable ? FECSTALL_DIS_DPTSTREAM_DPTTG : 0); > > intel_audio_sdp_split_update(pipe_config); -- Jani Nikula, Intel
