Skip to content

Commit 6bf3549

Browse files
aknautiyaljnikula
authored andcommitted
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. Fixes: 8b70b56 ("drm/i915/vdsc: Fill the intel_dsc_get_pps_config function") Cc: Suraj Kandpal <suraj.kandpal@intel.com> Cc: Ankit Nautiyal <ankit.k.nautiyal@intel.com> Cc: Animesh Manna <animesh.manna@intel.com> Cc: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com> Reviewed-by: Suraj Kandpal <suraj.kandpal@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20231122064627.905828-1-ankit.k.nautiyal@intel.com (cherry picked from commit baf31a2) Signed-off-by: Jani Nikula <jani.nikula@intel.com>
1 parent ceb6a6f commit 6bf3549

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/gpu/drm/i915/display/intel_display.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3747,8 +3747,8 @@ static bool hsw_get_pipe_config(struct intel_crtc *crtc,
37473747
if (!active)
37483748
goto out;
37493749

3750-
intel_dsc_get_config(pipe_config);
37513750
intel_bigjoiner_get_config(pipe_config);
3751+
intel_dsc_get_config(pipe_config);
37523752

37533753
if (!transcoder_is_dsi(pipe_config->cpu_transcoder) ||
37543754
DISPLAY_VER(dev_priv) >= 11)

0 commit comments

Comments
 (0)