> -----Original Message----- > From: Nautiyal, Ankit K <ankit.k.nautiyal@xxxxxxxxx> > Sent: Wednesday, November 22, 2023 12:16 PM > To: intel-gfx@xxxxxxxxxxxxxxxxxxxxx > Cc: Kandpal, Suraj <suraj.kandpal@xxxxxxxxx>; Manna, Animesh > <animesh.manna@xxxxxxxxx>; jani.nikula@xxxxxxxxxxxxxxx; Nautiyal, Ankit K > <ankit.k.nautiyal@xxxxxxxxx> > Subject: [PATCH] drm/i915/display: Get bigjoiner config before dsc config > during readout > > Currently we get bigjoiner config after the dsc get config, during HW readout. > Since dsc_get_config now uses bigjoiner flags/pipes to compute DSC PPS > parameter pic_width, this results in a state mismatch when Bigjoiner and DSC > are used together. > > So call get bigjoiner config before calling dsc get config function. > LGTM. Reviewed-by: Suraj Kandpal <suraj.kandpal@xxxxxxxxx> > Fixes: 8b70b5691704 ("drm/i915/vdsc: Fill the intel_dsc_get_pps_config > function") > Cc: Suraj Kandpal <suraj.kandpal@xxxxxxxxx> > Cc: Ankit Nautiyal <ankit.k.nautiyal@xxxxxxxxx> > Cc: Animesh Manna <animesh.manna@xxxxxxxxx> > Cc: Jani Nikula <jani.nikula@xxxxxxxxx> > > Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@xxxxxxxxx> > --- > drivers/gpu/drm/i915/display/intel_display.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c > b/drivers/gpu/drm/i915/display/intel_display.c > index 959db3f61e84..e086caf3963d 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -3694,8 +3694,8 @@ static bool hsw_get_pipe_config(struct intel_crtc > *crtc, > if (!active) > goto out; > > - intel_dsc_get_config(pipe_config); > intel_bigjoiner_get_config(pipe_config); > + intel_dsc_get_config(pipe_config); > > if (!transcoder_is_dsi(pipe_config->cpu_transcoder) || > DISPLAY_VER(dev_priv) >= 11) > -- > 2.40.1