| Message ID | 20240829-sm8650-v6-11-hmd-pocf-mdss-quad-upstream-8-v1-10-bdb05b4b5a2e@linaro.org (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | drm/msm: Support quad pipe with dual-DSI | expand |
On Thu, 29 Aug 2024 at 13:20, Jun Nie <jun.nie@linaro.org> wrote: > > Add the case to reserve multiple pair mixer for high resolution I think you already know what is missing here. > > Signed-off-by: Jun Nie <jun.nie@linaro.org> > --- > drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 6 +++--- > drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 8 +++++++- > 2 files changed, 10 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c > index 33cfd94badaba..f57725ad494d2 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c > @@ -54,7 +54,7 @@ > #define MAX_PHYS_ENCODERS_PER_VIRTUAL \ > (MAX_H_TILES_PER_DISPLAY * NUM_PHYS_ENCODER_TYPES) > > -#define MAX_CHANNELS_PER_ENC 2 > +#define MAX_CHANNELS_PER_ENC 4 > > #define IDLE_SHORT_TIMEOUT 1 > > @@ -2029,8 +2029,8 @@ static void dpu_encoder_helper_reset_mixers(struct dpu_encoder_phys *phys_enc) > struct dpu_hw_mixer_cfg mixer; > int i, num_lm; > struct dpu_global_state *global_state; > - struct dpu_hw_blk *hw_lm[2]; > - struct dpu_hw_mixer *hw_mixer[2]; > + struct dpu_hw_blk *hw_lm[MAX_CHANNELS_PER_ENC]; > + struct dpu_hw_mixer *hw_mixer[MAX_CHANNELS_PER_ENC]; > struct dpu_hw_ctl *ctl = phys_enc->hw_ctl; > > memset(&mixer, 0, sizeof(mixer)); > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c > index e219d706610c2..77d7ff789346e 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c > @@ -306,7 +306,11 @@ static int _dpu_rm_reserve_lms(struct dpu_rm *rm, > if (!rm->mixer_blks[i]) > continue; > > - lm_count = 0; > + /* > + * Clear the last bit to drop the previous primary mixer if > + * fail to find its peer. > + */ > + lm_count &= 0xfe; > lm_idx[lm_count] = i; > > if (!_dpu_rm_check_lm_and_get_connected_blks(rm, global_state, > @@ -353,6 +357,8 @@ static int _dpu_rm_reserve_lms(struct dpu_rm *rm, > > trace_dpu_rm_reserve_lms(lm_idx[i] + LM_0, enc_id, > pp_idx[i] + PINGPONG_0); > + DPU_DEBUG("reserve lm[%d]:%d, pp_idx[%d]:%d, dspp[%d]:%d for enc_id %d\n", > + i, lm_idx[i], i, pp_idx[i], i, dspp_idx[i], enc_id); > } > > return 0; > > -- > 2.34.1 >
Dmitry Baryshkov <dmitry.baryshkov@linaro.org> 于2024年8月29日周四 19:17写道： > > On Thu, 29 Aug 2024 at 13:20, Jun Nie <jun.nie@linaro.org> wrote: > > > > Add the case to reserve multiple pair mixer for high resolution > > I think you already know what is missing here. Add the case to reserve multiple pair mixer for high resolution. Current code only support one pair of mixer usage case. To support quad-pipe usage case, multiple pair mixers are needed. > > > > > Signed-off-by: Jun Nie <jun.nie@linaro.org> > > --- > > drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 6 +++--- > > drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 8 +++++++- > > 2 files changed, 10 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c > > index 33cfd94badaba..f57725ad494d2 100644 > > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c > > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c > > @@ -54,7 +54,7 @@ > > #define MAX_PHYS_ENCODERS_PER_VIRTUAL \ > > (MAX_H_TILES_PER_DISPLAY * NUM_PHYS_ENCODER_TYPES) > > > > -#define MAX_CHANNELS_PER_ENC 2 > > +#define MAX_CHANNELS_PER_ENC 4 > > > > #define IDLE_SHORT_TIMEOUT 1 > > > > @@ -2029,8 +2029,8 @@ static void dpu_encoder_helper_reset_mixers(struct dpu_encoder_phys *phys_enc) > > struct dpu_hw_mixer_cfg mixer; > > int i, num_lm; > > struct dpu_global_state *global_state; > > - struct dpu_hw_blk *hw_lm[2]; > > - struct dpu_hw_mixer *hw_mixer[2]; > > + struct dpu_hw_blk *hw_lm[MAX_CHANNELS_PER_ENC]; > > + struct dpu_hw_mixer *hw_mixer[MAX_CHANNELS_PER_ENC]; > > struct dpu_hw_ctl *ctl = phys_enc->hw_ctl; > > > > memset(&mixer, 0, sizeof(mixer)); > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c > > index e219d706610c2..77d7ff789346e 100644 > > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c > > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c > > @@ -306,7 +306,11 @@ static int _dpu_rm_reserve_lms(struct dpu_rm *rm, > > if (!rm->mixer_blks[i]) > > continue; > > > > - lm_count = 0; > > + /* > > + * Clear the last bit to drop the previous primary mixer if > > + * fail to find its peer. > > + */ > > + lm_count &= 0xfe; > > lm_idx[lm_count] = i; > > > > if (!_dpu_rm_check_lm_and_get_connected_blks(rm, global_state, > > @@ -353,6 +357,8 @@ static int _dpu_rm_reserve_lms(struct dpu_rm *rm, > > > > trace_dpu_rm_reserve_lms(lm_idx[i] + LM_0, enc_id, > > pp_idx[i] + PINGPONG_0); > > + DPU_DEBUG("reserve lm[%d]:%d, pp_idx[%d]:%d, dspp[%d]:%d for enc_id %d\n", > > + i, lm_idx[i], i, pp_idx[i], i, dspp_idx[i], enc_id); > > } > > > > return 0; > > > > -- > > 2.34.1 > > > > > -- > With best wishes > Dmitry
On Tue, 3 Sept 2024 at 10:50, Jun Nie <jun.nie@linaro.org> wrote: > > Dmitry Baryshkov <dmitry.baryshkov@linaro.org> 于2024年8月29日周四 19:17写道： > > > > On Thu, 29 Aug 2024 at 13:20, Jun Nie <jun.nie@linaro.org> wrote: > > > > > > Add the case to reserve multiple pair mixer for high resolution > > > > I think you already know what is missing here. > > Add the case to reserve multiple pair mixer for high resolution. Current > code only support one pair of mixer usage case. To support quad-pipe > usage case, multiple pair mixers are needed. pairs of mixers. supports two pairs of mixers Also the text doesn't describe how that works. It's not obvious from the patch, one has to read the source to understand what is going on. Please make it clear. > > > > > > > > > Signed-off-by: Jun Nie <jun.nie@linaro.org> > > > --- > > > drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 6 +++--- > > > drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 8 +++++++- > > > 2 files changed, 10 insertions(+), 4 deletions(-) > > > > > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c > > > index 33cfd94badaba..f57725ad494d2 100644 > > > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c > > > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c > > > @@ -54,7 +54,7 @@ > > > #define MAX_PHYS_ENCODERS_PER_VIRTUAL \ > > > (MAX_H_TILES_PER_DISPLAY * NUM_PHYS_ENCODER_TYPES) > > > > > > -#define MAX_CHANNELS_PER_ENC 2 > > > +#define MAX_CHANNELS_PER_ENC 4 > > > > > > #define IDLE_SHORT_TIMEOUT 1 > > > > > > @@ -2029,8 +2029,8 @@ static void dpu_encoder_helper_reset_mixers(struct dpu_encoder_phys *phys_enc) > > > struct dpu_hw_mixer_cfg mixer; > > > int i, num_lm; > > > struct dpu_global_state *global_state; > > > - struct dpu_hw_blk *hw_lm[2]; > > > - struct dpu_hw_mixer *hw_mixer[2]; > > > + struct dpu_hw_blk *hw_lm[MAX_CHANNELS_PER_ENC]; > > > + struct dpu_hw_mixer *hw_mixer[MAX_CHANNELS_PER_ENC]; > > > struct dpu_hw_ctl *ctl = phys_enc->hw_ctl; > > > > > > memset(&mixer, 0, sizeof(mixer)); > > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c > > > index e219d706610c2..77d7ff789346e 100644 > > > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c > > > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c > > > @@ -306,7 +306,11 @@ static int _dpu_rm_reserve_lms(struct dpu_rm *rm, > > > if (!rm->mixer_blks[i]) > > > continue; > > > > > > - lm_count = 0; > > > + /* > > > + * Clear the last bit to drop the previous primary mixer if > > > + * fail to find its peer. > > > + */ > > > + lm_count &= 0xfe; > > > lm_idx[lm_count] = i; > > > > > > if (!_dpu_rm_check_lm_and_get_connected_blks(rm, global_state, > > > @@ -353,6 +357,8 @@ static int _dpu_rm_reserve_lms(struct dpu_rm *rm, > > > > > > trace_dpu_rm_reserve_lms(lm_idx[i] + LM_0, enc_id, > > > pp_idx[i] + PINGPONG_0); > > > + DPU_DEBUG("reserve lm[%d]:%d, pp_idx[%d]:%d, dspp[%d]:%d for enc_id %d\n", > > > + i, lm_idx[i], i, pp_idx[i], i, dspp_idx[i], enc_id); > > > } > > > > > > return 0; > > > > > > -- > > > 2.34.1 > > > > > > > > > -- > > With best wishes > > Dmitry
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c index 33cfd94badaba..f57725ad494d2 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c @@ -54,7 +54,7 @@ #define MAX_PHYS_ENCODERS_PER_VIRTUAL \ (MAX_H_TILES_PER_DISPLAY * NUM_PHYS_ENCODER_TYPES) -#define MAX_CHANNELS_PER_ENC 2 +#define MAX_CHANNELS_PER_ENC 4 #define IDLE_SHORT_TIMEOUT 1 @@ -2029,8 +2029,8 @@ static void dpu_encoder_helper_reset_mixers(struct dpu_encoder_phys *phys_enc) struct dpu_hw_mixer_cfg mixer; int i, num_lm; struct dpu_global_state *global_state; - struct dpu_hw_blk *hw_lm[2]; - struct dpu_hw_mixer *hw_mixer[2]; + struct dpu_hw_blk *hw_lm[MAX_CHANNELS_PER_ENC]; + struct dpu_hw_mixer *hw_mixer[MAX_CHANNELS_PER_ENC]; struct dpu_hw_ctl *ctl = phys_enc->hw_ctl; memset(&mixer, 0, sizeof(mixer)); diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c index e219d706610c2..77d7ff789346e 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c @@ -306,7 +306,11 @@ static int _dpu_rm_reserve_lms(struct dpu_rm *rm, if (!rm->mixer_blks[i]) continue; - lm_count = 0; + /* + * Clear the last bit to drop the previous primary mixer if + * fail to find its peer. + */ + lm_count &= 0xfe; lm_idx[lm_count] = i; if (!_dpu_rm_check_lm_and_get_connected_blks(rm, global_state, @@ -353,6 +357,8 @@ static int _dpu_rm_reserve_lms(struct dpu_rm *rm, trace_dpu_rm_reserve_lms(lm_idx[i] + LM_0, enc_id, pp_idx[i] + PINGPONG_0); + DPU_DEBUG("reserve lm[%d]:%d, pp_idx[%d]:%d, dspp[%d]:%d for enc_id %d\n", + i, lm_idx[i], i, pp_idx[i], i, dspp_idx[i], enc_id); } return 0;
Add the case to reserve multiple pair mixer for high resolution Signed-off-by: Jun Nie <jun.nie@linaro.org> --- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 6 +++--- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 8 +++++++- 2 files changed, 10 insertions(+), 4 deletions(-)