Thanks Jani. I updated the patch. Could you please push to the drm-tip.
Thanks
Vinod
On Mon, 2022-11-21 at 15:15 +0200, Jani Nikula wrote:
> On Tue, 01 Nov 2022, Vinod Govindapillai <vinod.govindapillai@xxxxxxxxx> wrote:
> > Enable the SDP split configuration for DP2.0.
> >
> > v2: Move the register handling out of compute config function (JaniN)
> >
> > v3: Patch styling and register access based on platform support (JaniN)
> >
> > v4: Rebased
> >
> > Bspec: 67768
> > Signed-off-by: Vinod Govindapillai <vinod.govindapillai@xxxxxxxxx>
> > ---
> > drivers/gpu/drm/i915/display/intel_audio.c | 12 ++++++++++++
> > drivers/gpu/drm/i915/display/intel_audio.h | 2 ++
> > drivers/gpu/drm/i915/display/intel_ddi.c | 3 +++
> > .../drm/i915/display/intel_display_types.h | 2 ++
> > drivers/gpu/drm/i915/display/intel_dp.c | 19 +++++++++++++++++++
> > 5 files changed, 38 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/i915/display/intel_audio.c
> > b/drivers/gpu/drm/i915/display/intel_audio.c
> > index c3176c9c89a6..415ac3960272 100644
> > --- a/drivers/gpu/drm/i915/display/intel_audio.c
> > +++ b/drivers/gpu/drm/i915/display/intel_audio.c
> > @@ -798,6 +798,18 @@ static void ilk_audio_codec_enable(struct intel_encoder *encoder,
> > mutex_unlock(&i915->display.audio.mutex);
> > }
> >
> > +void intel_audio_sdp_split_update(struct intel_encoder *encoder,
> > + const struct intel_crtc_state *crtc_state)
> > +{
> > + struct drm_i915_private *i915 = to_i915(encoder->base.dev);
> > + enum transcoder trans = crtc_state->cpu_transcoder;
> > + u32 clear = crtc_state->sdp_split_enable ? 0 : AUD_ENABLE_SDP_SPLIT;
> > + u32 set = crtc_state->sdp_split_enable ? AUD_ENABLE_SDP_SPLIT : 0;
> > +
> > + if (HAS_DP20(i915))
> > + intel_de_rmw(i915, AUD_DP_2DOT0_CTRL(trans), clear, set);
>
> It's customary to unconditionally set the clear mask.
>
> intel_de_rmw(i915, AUD_DP_2DOT0_CTRL(trans), AUD_ENABLE_SDP_SPLIT,
> crtc_state->sdp_split_enable ? AUD_ENABLE_SDP_SPLIT : 0);
>
> With that fixed,
>
> Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx>
>
>
> > +}
>
> I'm still not entirely happy about adding this very specific function to
> intel_audio.[ch] interfaces, but I guess it's simple enough to change if
> we find a nicer place for it.
>
> > +
> > /**
> > * intel_audio_codec_enable - Enable the audio codec for HD audio
> > * @encoder: encoder on which to enable audio
> > diff --git a/drivers/gpu/drm/i915/display/intel_audio.h
> > b/drivers/gpu/drm/i915/display/intel_audio.h
> > index 63b22131dc45..1b87257c6a17 100644
> > --- a/drivers/gpu/drm/i915/display/intel_audio.h
> > +++ b/drivers/gpu/drm/i915/display/intel_audio.h
> > @@ -22,5 +22,7 @@ void intel_audio_cdclk_change_pre(struct drm_i915_private *dev_priv);
> > void intel_audio_cdclk_change_post(struct drm_i915_private *dev_priv);
> > void intel_audio_init(struct drm_i915_private *dev_priv);
> > void intel_audio_deinit(struct drm_i915_private *dev_priv);
> > +void intel_audio_sdp_split_update(struct intel_encoder *encoder,
> > + const struct intel_crtc_state *crtc_state);
> >
> > #endif /* __INTEL_AUDIO_H__ */
> > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
> > index e95bde5cf060..c84b7b0e4c19 100644
> > --- a/drivers/gpu/drm/i915/display/intel_ddi.c
> > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c
> > @@ -2917,6 +2917,9 @@ static void intel_enable_ddi(struct intel_atomic_state *state,
> >
> > intel_vrr_enable(encoder, crtc_state);
> >
> > + /* Enable/Disable DP2.0 SDP split config before transcoder */
> > + intel_audio_sdp_split_update(encoder, crtc_state);
> > +
> > intel_enable_transcoder(crtc_state);
> >
> > intel_crtc_vblank_on(crtc_state);
> > diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h
> > b/drivers/gpu/drm/i915/display/intel_display_types.h
> > index 7f18c052ec16..07eab71d3fc2 100644
> > --- a/drivers/gpu/drm/i915/display/intel_display_types.h
> > +++ b/drivers/gpu/drm/i915/display/intel_display_types.h
> > @@ -1286,6 +1286,8 @@ struct intel_crtc_state {
> > /* Forward Error correction State */
> > bool fec_enable;
> >
> > + bool sdp_split_enable;
> > +
> > /* Pointer to master transcoder in case of tiled displays */
> > enum transcoder master_transcoder;
> >
> > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
> > index 7400d6b4c587..8a1af1294c6a 100644
> > --- a/drivers/gpu/drm/i915/display/intel_dp.c
> > +++ b/drivers/gpu/drm/i915/display/intel_dp.c
> > @@ -2008,6 +2008,23 @@ intel_dp_compute_output_format(struct intel_encoder *encoder,
> > return ret;
> > }
> >
> > +static void
> > +intel_dp_audio_compute_config(struct intel_encoder *encoder,
> > + struct intel_crtc_state *pipe_config,
> > + struct drm_connector_state *conn_state)
> > +{
> > + struct drm_i915_private *i915 = to_i915(encoder->base.dev);
> > + struct drm_connector *connector = conn_state->connector;
> > +
> > + pipe_config->sdp_split_enable =
> > + intel_dp_has_audio(encoder, pipe_config, conn_state) &&
> > + intel_dp_is_uhbr(pipe_config);
>
> The indentation is probably off here.
>
> > +
> > + drm_dbg_kms(&i915->drm, "[CONNECTOR:%d:%s] SDP split enable: %s\n",
> > + connector->base.id, connector->name,
> > + str_yes_no(pipe_config->sdp_split_enable));
> > +}
> > +
> > int
> > intel_dp_compute_config(struct intel_encoder *encoder,
> > struct intel_crtc_state *pipe_config,
> > @@ -2091,6 +2108,8 @@ intel_dp_compute_config(struct intel_encoder *encoder,
> > adjusted_mode->crtc_clock /= n;
> > }
> >
> > + intel_dp_audio_compute_config(encoder, pipe_config, conn_state);
> > +
> > intel_link_compute_m_n(output_bpp,
> > pipe_config->lane_count,
> > adjusted_mode->crtc_clock,
>
