| Message ID | 20230211231259.1308718-33-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: > Duplicate some of sc7180 catalog entries to remove dependencies between > DPU major generations. > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h > index 8977878890f1..3117bb358117 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h > +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h > @@ -82,6 +82,11 @@ static const struct dpu_lm_cfg sc7280_lm[] = { > &sc7180_lm_sblk, PINGPONG_3, LM_2, 0), > }; > > +static const struct dpu_dspp_cfg sc7280_dspp[] = { > + DSPP_BLK("dspp_0", DSPP_0, 0x54000, DSPP_SC7180_MASK, > + &sc7180_dspp_sblk), If I'm following correctly, the sc7180_dspp_sblk is still defined in the common hw_catalog.c and things won't explode. In that case: Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> Konrad > +}; > + > static const struct dpu_pingpong_cfg sc7280_pp[] = { > PP_BLK("pingpong_0", PINGPONG_0, 0x59000, 0, sc7280_pp_sblk, -1, -1), > PP_BLK("pingpong_1", PINGPONG_1, 0x6a000, 0, sc7280_pp_sblk, -1, -1), > @@ -132,8 +137,8 @@ static const struct dpu_mdss_cfg sc7280_dpu_cfg = { > .ctl = sc7280_ctl, > .sspp_count = ARRAY_SIZE(sc7280_sspp), > .sspp = sc7280_sspp, > - .dspp_count = ARRAY_SIZE(sc7180_dspp), > - .dspp = sc7180_dspp, > + .dspp_count = ARRAY_SIZE(sc7280_dspp), > + .dspp = sc7280_dspp, > .mixer_count = ARRAY_SIZE(sc7280_lm), > .mixer = sc7280_lm, > .pingpong_count = ARRAY_SIZE(sc7280_pp),
On 30/03/2023 15:22, Konrad Dybcio wrote: > > > On 12.02.2023 00:12, Dmitry Baryshkov wrote: >> Duplicate some of sc7180 catalog entries to remove dependencies between >> DPU major generations. >> >> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> >> --- >> drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 9 +++++++-- >> 1 file changed, 7 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h >> index 8977878890f1..3117bb358117 100644 >> --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h >> +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h >> @@ -82,6 +82,11 @@ static const struct dpu_lm_cfg sc7280_lm[] = { >> &sc7180_lm_sblk, PINGPONG_3, LM_2, 0), >> }; >> >> +static const struct dpu_dspp_cfg sc7280_dspp[] = { >> + DSPP_BLK("dspp_0", DSPP_0, 0x54000, DSPP_SC7180_MASK, >> + &sc7180_dspp_sblk), > If I'm following correctly, the sc7180_dspp_sblk is still defined > in the common hw_catalog.c and things won't explode. Yes, I left sblk definitions in place (for now). We can consider splitting/moving them afterwards, as we get the overall picture. > > In that case: > > Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> > > Konrad >> +}; >> + >> static const struct dpu_pingpong_cfg sc7280_pp[] = { >> PP_BLK("pingpong_0", PINGPONG_0, 0x59000, 0, sc7280_pp_sblk, -1, -1), >> PP_BLK("pingpong_1", PINGPONG_1, 0x6a000, 0, sc7280_pp_sblk, -1, -1), >> @@ -132,8 +137,8 @@ static const struct dpu_mdss_cfg sc7280_dpu_cfg = { >> .ctl = sc7280_ctl, >> .sspp_count = ARRAY_SIZE(sc7280_sspp), >> .sspp = sc7280_sspp, >> - .dspp_count = ARRAY_SIZE(sc7180_dspp), >> - .dspp = sc7180_dspp, >> + .dspp_count = ARRAY_SIZE(sc7280_dspp), >> + .dspp = sc7280_dspp, >> .mixer_count = ARRAY_SIZE(sc7280_lm), >> .mixer = sc7280_lm, >> .pingpong_count = ARRAY_SIZE(sc7280_pp),
diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h index 8977878890f1..3117bb358117 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h @@ -82,6 +82,11 @@ static const struct dpu_lm_cfg sc7280_lm[] = { &sc7180_lm_sblk, PINGPONG_3, LM_2, 0), }; +static const struct dpu_dspp_cfg sc7280_dspp[] = { + DSPP_BLK("dspp_0", DSPP_0, 0x54000, DSPP_SC7180_MASK, + &sc7180_dspp_sblk), +}; + static const struct dpu_pingpong_cfg sc7280_pp[] = { PP_BLK("pingpong_0", PINGPONG_0, 0x59000, 0, sc7280_pp_sblk, -1, -1), PP_BLK("pingpong_1", PINGPONG_1, 0x6a000, 0, sc7280_pp_sblk, -1, -1), @@ -132,8 +137,8 @@ static const struct dpu_mdss_cfg sc7280_dpu_cfg = { .ctl = sc7280_ctl, .sspp_count = ARRAY_SIZE(sc7280_sspp), .sspp = sc7280_sspp, - .dspp_count = ARRAY_SIZE(sc7180_dspp), - .dspp = sc7180_dspp, + .dspp_count = ARRAY_SIZE(sc7280_dspp), + .dspp = sc7280_dspp, .mixer_count = ARRAY_SIZE(sc7280_lm), .mixer = sc7280_lm, .pingpong_count = ARRAY_SIZE(sc7280_pp),
Duplicate some of sc7180 catalog entries to remove dependencies between DPU major generations. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)