On Wed, 9 Oct 2024 at 09:39, Jun Nie <jun.nie@xxxxxxxxxx> wrote: > > Only 2 DSC engines are allowed, or no DSC is involved currently. Can't parse this phrase. > We need 4 DSC in quad-pipe topology in future. So let's only configure > DSC engines in use, instread of maximum number of DSC engines. Nit: instead > > Signed-off-by: Jun Nie <jun.nie@xxxxxxxxxx> > --- > drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 13 ++++++++----- > 1 file changed, 8 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c > index 39700b13e92f3..e8400b494687c 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c > @@ -1871,10 +1871,13 @@ static void dpu_encoder_dsc_pipe_cfg(struct dpu_hw_ctl *ctl, > ctl->ops.update_pending_flush_dsc(ctl, hw_dsc->idx); > } > > -static void dpu_encoder_prep_dsc(struct dpu_encoder_virt *dpu_enc, > - struct drm_dsc_config *dsc) > +static void dpu_encoder_prep_dsc(struct drm_encoder *drm_enc) > { > /* coding only for 2LM, 2enc, 1 dsc config */ > + struct dpu_encoder_virt *dpu_enc = to_dpu_encoder_virt(drm_enc); > + struct dpu_crtc_state *cstate = to_dpu_crtc_state(drm_enc->crtc->state); > + struct drm_dsc_config *dsc = dpu_enc->dsc; Why? This doesn't seem to be related to num_dscs introduction. > + int num_dsc = cstate->num_dscs; > struct dpu_encoder_phys *enc_master = dpu_enc->cur_master; > struct dpu_hw_ctl *ctl = enc_master->hw_ctl; > struct dpu_hw_dsc *hw_dsc[MAX_CHANNELS_PER_ENC]; [...] > @@ -1953,7 +1956,7 @@ void dpu_encoder_prepare_for_kickoff(struct drm_encoder *drm_enc) > } > > if (dpu_enc->dsc) > - dpu_encoder_prep_dsc(dpu_enc, dpu_enc->dsc); > + dpu_encoder_prep_dsc(drm_enc); > } > > bool dpu_encoder_is_valid_for_commit(struct drm_encoder *drm_enc) > > -- > 2.34.1 > -- With best wishes Dmitry