Skip to content

Commit 0785691

Browse files
aknautiyalrodrigovivi
authored andcommitted
drm/i915/vdsc: Set VDSC PIC_HEIGHT before using for DP DSC
Currently, pic_height of vdsc_cfg structure is being used to calculate slice_height, before it is set for DP. So taking out the lines to set pic_height from the helper intel_dp_dsc_compute_params() to individual encoders, and setting pic_height, before it is used to calculate slice_height for DP. Fixes: 5a6d866 ("drm/i915: Get slice height before computing rc params") Cc: Manasi Navare <manasi.d.navare@intel.com> Cc: Vandita Kulkarni <vandita.kulkarni@intel.com> Cc: Matt Roper <matthew.d.roper@intel.com> Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com> Reviewed-by: Vandita Kulkarni <vandita.kulkarni@intel.com> Signed-off-by: Matt Roper <matthew.d.roper@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20220902103219.1168781-1-ankit.k.nautiyal@intel.com (cherry picked from commit e72df53) Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
1 parent 80e78fc commit 0785691

3 files changed

Lines changed: 3 additions & 1 deletion

File tree

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1629,6 +1629,8 @@ static int gen11_dsi_dsc_compute_config(struct intel_encoder *encoder,
16291629
/* FIXME: initialize from VBT */
16301630
vdsc_cfg->rc_model_size = DSC_RC_MODEL_SIZE_CONST;
16311631

1632+
vdsc_cfg->pic_height = crtc_state->hw.adjusted_mode.crtc_vdisplay;
1633+
16321634
ret = intel_dsc_compute_params(crtc_state);
16331635
if (ret)
16341636
return ret;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1395,6 +1395,7 @@ static int intel_dp_dsc_compute_params(struct intel_encoder *encoder,
13951395
* DP_DSC_RC_BUF_SIZE for this.
13961396
*/
13971397
vdsc_cfg->rc_model_size = DSC_RC_MODEL_SIZE_CONST;
1398+
vdsc_cfg->pic_height = crtc_state->hw.adjusted_mode.crtc_vdisplay;
13981399

13991400
/*
14001401
* Slice Height of 8 works for all currently available panels. So start

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,6 @@ int intel_dsc_compute_params(struct intel_crtc_state *pipe_config)
460460
u8 i = 0;
461461

462462
vdsc_cfg->pic_width = pipe_config->hw.adjusted_mode.crtc_hdisplay;
463-
vdsc_cfg->pic_height = pipe_config->hw.adjusted_mode.crtc_vdisplay;
464463
vdsc_cfg->slice_width = DIV_ROUND_UP(vdsc_cfg->pic_width,
465464
pipe_config->dsc.slice_count);
466465

0 commit comments

Comments
 (0)