On Mon, Dec 16, 2024 at 05:39:15PM -0800, Abhinav Kumar wrote: > > > On 12/16/2024 4:43 PM, Jessica Zhang wrote: > > From: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx> > > > > Stop poking into CRTC state from dpu_encoder.c, fill CRTC HW resources > > from dpu_crtc_assign_resources(). > > > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx> > > [quic_abhinavk@xxxxxxxxxxx: cleaned up formatting] > > Signed-off-by: Abhinav Kumar <quic_abhinavk@xxxxxxxxxxx> > > Signed-off-by: Jessica Zhang <quic_jesszhan@xxxxxxxxxxx> > > --- > > drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 29 +++++++++++++++++++++++++++++ > > drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 4 ++-- > > 2 files changed, 31 insertions(+), 2 deletions(-) > > > > <snip> > > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c > > index 2b999a0558b2a016644ed5d25bf54ab45c38d1d9..a895d48fe81ccc71d265e089992786e8b6268b1b 100644 > > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c > > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c > > @@ -1138,7 +1138,7 @@ static void dpu_encoder_virt_atomic_mode_set(struct drm_encoder *drm_enc, > > struct dpu_hw_blk *hw_pp[MAX_CHANNELS_PER_ENC]; > > struct dpu_hw_blk *hw_ctl[MAX_CHANNELS_PER_ENC]; > > struct dpu_hw_blk *hw_dsc[MAX_CHANNELS_PER_ENC]; > > - int num_ctl, num_pp, num_dsc; > > + int num_pp, num_dsc, num_ctl; > > unsigned int dsc_mask = 0; > > int i; > > @@ -1166,7 +1166,7 @@ static void dpu_encoder_virt_atomic_mode_set(struct drm_encoder *drm_enc, > > drm_enc->crtc, DPU_HW_BLK_PINGPONG, hw_pp, > > ARRAY_SIZE(hw_pp)); > > num_ctl = dpu_rm_get_assigned_resources(&dpu_kms->rm, global_state, > > - drm_enc->crtc, DPU_HW_BLK_CTL, hw_ctl, ARRAY_SIZE(hw_ctl)); > > + drm_enc->crtc, DPU_HW_BLK_CTL, hw_ctl, ARRAY_SIZE(hw_ctl)); > > for (i = 0; i < MAX_CHANNELS_PER_ENC; i++) > > dpu_enc->hw_pp[i] = i < num_pp ? to_dpu_hw_pingpong(hw_pp[i]) > > > > This chunk of diff is unnecessary. You are just changing the order of > defines and fixing alignment. Does not have to be in this change. I can drop it while applying. -- With best wishes Dmitry
