| Message ID | 20230211231259.1308718-39-dmitry.baryshkov@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | drm/msm/dpu: rework HW catalog | expand |
On 12.02.2023 00:12, Dmitry Baryshkov wrote: > Mark DSPP_2 and DSPP_3 as used for LM_2 and LM_3 > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- Could you point me to where it's specified downstream? I can't find it. Also, deserves a Fixes. Konrad > drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h > index a3faaab2226c..3d95f2472e7a 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h > +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h > @@ -107,9 +107,9 @@ static const struct dpu_lm_cfg sm8450_lm[] = { > LM_BLK("lm_1", LM_1, 0x45000, MIXER_SDM845_MASK, > &sdm845_lm_sblk, PINGPONG_1, LM_0, DSPP_1), > LM_BLK("lm_2", LM_2, 0x46000, MIXER_SDM845_MASK, > - &sdm845_lm_sblk, PINGPONG_2, LM_3, 0), > + &sdm845_lm_sblk, PINGPONG_2, LM_3, DSPP_2), > LM_BLK("lm_3", LM_3, 0x47000, MIXER_SDM845_MASK, > - &sdm845_lm_sblk, PINGPONG_3, LM_2, 0), > + &sdm845_lm_sblk, PINGPONG_3, LM_2, DSPP_3), > LM_BLK("lm_4", LM_4, 0x48000, MIXER_SDM845_MASK, > &sdm845_lm_sblk, PINGPONG_4, LM_5, 0), > LM_BLK("lm_5", LM_5, 0x49000, MIXER_SDM845_MASK,
On 30/03/2023 15:33, Konrad Dybcio wrote: > > > On 12.02.2023 00:12, Dmitry Baryshkov wrote: >> Mark DSPP_2 and DSPP_3 as used for LM_2 and LM_3 >> >> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> >> --- > Could you point me to where it's specified downstream? I can't find it. https://git.codelinaro.org/clo/la/platform/vendor/opensource/display-drivers/-/blob/77276ed6a0055a4a0f41d7b0395a8b0bbcafd091/msm/sde/sde_hw_catalog.c#L2341 Which says assign DSPP to LMs for as long as we have a spare DSPP > > Also, deserves a Fixes. This is a tough question. We have been using sm8150_lm for sm8[2345]50. So before "drm/msm/dpu: duplicate sm8150 catalog entries" there is no way to fix that. > > Konrad >> drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h >> index a3faaab2226c..3d95f2472e7a 100644 >> --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h >> +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h >> @@ -107,9 +107,9 @@ static const struct dpu_lm_cfg sm8450_lm[] = { >> LM_BLK("lm_1", LM_1, 0x45000, MIXER_SDM845_MASK, >> &sdm845_lm_sblk, PINGPONG_1, LM_0, DSPP_1), >> LM_BLK("lm_2", LM_2, 0x46000, MIXER_SDM845_MASK, >> - &sdm845_lm_sblk, PINGPONG_2, LM_3, 0), >> + &sdm845_lm_sblk, PINGPONG_2, LM_3, DSPP_2), >> LM_BLK("lm_3", LM_3, 0x47000, MIXER_SDM845_MASK, >> - &sdm845_lm_sblk, PINGPONG_3, LM_2, 0), >> + &sdm845_lm_sblk, PINGPONG_3, LM_2, DSPP_3), >> LM_BLK("lm_4", LM_4, 0x48000, MIXER_SDM845_MASK, >> &sdm845_lm_sblk, PINGPONG_4, LM_5, 0), >> LM_BLK("lm_5", LM_5, 0x49000, MIXER_SDM845_MASK,
On 30.03.2023 14:38, Dmitry Baryshkov wrote: > On 30/03/2023 15:33, Konrad Dybcio wrote: >> >> >> On 12.02.2023 00:12, Dmitry Baryshkov wrote: >>> Mark DSPP_2 and DSPP_3 as used for LM_2 and LM_3 >>> >>> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> >>> --- >> Could you point me to where it's specified downstream? I can't find it. > > https://git.codelinaro.org/clo/la/platform/vendor/opensource/display-drivers/-/blob/77276ed6a0055a4a0f41d7b0395a8b0bbcafd091/msm/sde/sde_hw_catalog.c#L2341 > > Which says assign DSPP to LMs for as long as we have a spare DSPP > >> >> Also, deserves a Fixes. > > This is a tough question. We have been using sm8150_lm for sm8[2345]50. So before "drm/msm/dpu: duplicate sm8150 catalog entries" there is no way to fix that. If your concern is about stable backports, fixes tags denote that a bug was fixed and do not imply a patch needs to be backported, it only works as a hint for the stable scripts. "please backport this" is expressed through Cc-ing stable. Konrad > >> >> Konrad >>> drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h | 4 ++-- >>> 1 file changed, 2 insertions(+), 2 deletions(-) >>> >>> diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h >>> index a3faaab2226c..3d95f2472e7a 100644 >>> --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h >>> +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h >>> @@ -107,9 +107,9 @@ static const struct dpu_lm_cfg sm8450_lm[] = { >>> LM_BLK("lm_1", LM_1, 0x45000, MIXER_SDM845_MASK, >>> &sdm845_lm_sblk, PINGPONG_1, LM_0, DSPP_1), >>> LM_BLK("lm_2", LM_2, 0x46000, MIXER_SDM845_MASK, >>> - &sdm845_lm_sblk, PINGPONG_2, LM_3, 0), >>> + &sdm845_lm_sblk, PINGPONG_2, LM_3, DSPP_2), >>> LM_BLK("lm_3", LM_3, 0x47000, MIXER_SDM845_MASK, >>> - &sdm845_lm_sblk, PINGPONG_3, LM_2, 0), >>> + &sdm845_lm_sblk, PINGPONG_3, LM_2, DSPP_3), >>> LM_BLK("lm_4", LM_4, 0x48000, MIXER_SDM845_MASK, >>> &sdm845_lm_sblk, PINGPONG_4, LM_5, 0), >>> LM_BLK("lm_5", LM_5, 0x49000, MIXER_SDM845_MASK, >
diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h index a3faaab2226c..3d95f2472e7a 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h @@ -107,9 +107,9 @@ static const struct dpu_lm_cfg sm8450_lm[] = { LM_BLK("lm_1", LM_1, 0x45000, MIXER_SDM845_MASK, &sdm845_lm_sblk, PINGPONG_1, LM_0, DSPP_1), LM_BLK("lm_2", LM_2, 0x46000, MIXER_SDM845_MASK, - &sdm845_lm_sblk, PINGPONG_2, LM_3, 0), + &sdm845_lm_sblk, PINGPONG_2, LM_3, DSPP_2), LM_BLK("lm_3", LM_3, 0x47000, MIXER_SDM845_MASK, - &sdm845_lm_sblk, PINGPONG_3, LM_2, 0), + &sdm845_lm_sblk, PINGPONG_3, LM_2, DSPP_3), LM_BLK("lm_4", LM_4, 0x48000, MIXER_SDM845_MASK, &sdm845_lm_sblk, PINGPONG_4, LM_5, 0), LM_BLK("lm_5", LM_5, 0x49000, MIXER_SDM845_MASK,
Mark DSPP_2 and DSPP_3 as used for LM_2 and LM_3 Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)