On Thu, Dec 14, 2023 at 01:48:37PM +0200, Jouni Högander wrote: > VSC SDP sending is taken care by PSR HW and it's not enabled in > VIDEO_DIP_CTL when PSR is enabled. Readback of VSC SDP is depending on > VSC_SDP being set in intel_crtc_state->infoframes.enabled. In case of PSR > setting this flag is taken care by PSR code -> read back PSR configuration > before reading VSC SDP otherwise we get pipeconfig mismatch error. > > Signed-off-by: Jouni Högander <jouni.hogander@xxxxxxxxx> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx> > --- > drivers/gpu/drm/i915/display/intel_ddi.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c > index 12a29363e5df..2746655bcb26 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > @@ -3941,11 +3941,11 @@ static void intel_ddi_get_config(struct intel_encoder *encoder, > if (DISPLAY_VER(dev_priv) >= 8) > bdw_get_trans_port_sync_config(pipe_config); > > + intel_psr_get_config(encoder, pipe_config); > + > intel_read_dp_sdp(encoder, pipe_config, HDMI_PACKET_TYPE_GAMUT_METADATA); > intel_read_dp_sdp(encoder, pipe_config, DP_SDP_VSC); > > - intel_psr_get_config(encoder, pipe_config); > - > intel_audio_codec_get_config(encoder, pipe_config); > } > > -- > 2.34.1 >