| Message ID | 20230613001004.3426676-1-dmitry.baryshkov@linaro.org |
|---|---|
| Headers | show |
| Series | drm/msm/dpu: another catalog rework | expand |
On 6/12/2023 5:09 PM, Dmitry Baryshkov wrote: > In several catalog entries we did not use existing MSM_DP_CONTROLLER_n > constants. Fill them in. Also use freshly defined MSM_DSI_CONTROLLER_n > for DSI interfaces. > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 6 +++--- > drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h | 8 ++++---- > drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h | 8 ++++---- > drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h | 4 ++-- > drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h | 8 ++++---- > drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h | 2 +- > drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h | 2 +- > drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h | 2 +- > drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h | 4 ++-- > drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 2 +- > drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h | 4 ++-- > drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h | 4 ++-- > drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h | 4 ++-- > 13 files changed, 29 insertions(+), 29 deletions(-) > Patch itself is fine. But sm6375 and sm6350 are missing as this needs to be rebased on top of the tip of msm-next-lumag.
On Tue, 13 Jun 2023 03:09:39 +0300, Dmitry Baryshkov wrote: > Having a macro with 10 arguments doesn't seem like a good idea. It makes > it inherently harder to compare the actual structure values. Also this > leads to adding macros covering varieties of the block. > > As it was previously discussed, inline all foo_BLK macros in order to > ease performing changes to the catalog data. > > [...] Applied, thanks! [01/22] drm/msm/dpu: fix sc7280 and sc7180 PINGPONG done interrupts https://gitlab.freedesktop.org/lumag/msm/-/commit/5efc0fec31d8 [02/22] drm/msm/dpu: correct MERGE_3D length https://gitlab.freedesktop.org/lumag/msm/-/commit/f01fb5e211fd [03/22] drm/msm/dpu: remove unused INTF_NONE interfaces https://gitlab.freedesktop.org/lumag/msm/-/commit/17bf6f8efc50 Best regards,
On 16/06/2023 01:05, Marijn Suijten wrote: > On 2023-06-13 03:09:56, Dmitry Baryshkov wrote: >> To simplify making changes to the hardware block definitions, expand >> corresponding macros. This way making all the changes are more obvious >> and visible in the source files. >> >> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> >> --- >> .../msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 11 +++++-- >> .../msm/disp/dpu1/catalog/dpu_4_0_sdm845.h | 17 +++++++--- >> .../msm/disp/dpu1/catalog/dpu_5_0_sm8150.h | 21 ++++++++++--- >> .../msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h | 31 +++++++++++++++---- >> .../msm/disp/dpu1/catalog/dpu_6_0_sm8250.h | 21 ++++++++++--- >> .../msm/disp/dpu1/catalog/dpu_6_4_sm6350.h | 6 +++- >> .../msm/disp/dpu1/catalog/dpu_6_9_sm6375.h | 6 +++- >> .../gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 10 ------ >> 8 files changed, 91 insertions(+), 32 deletions(-) >> >> diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h >> index a07c68744b29..7c3da4033c46 100644 >> --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h >> +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h >> @@ -200,8 +200,15 @@ static const struct dpu_pingpong_cfg msm8998_pp[] = { >> }; >> >> static const struct dpu_dsc_cfg msm8998_dsc[] = { >> - DSC_BLK("dsc_0", DSC_0, 0x80000, 0), >> - DSC_BLK("dsc_1", DSC_1, 0x80400, 0), >> + { >> + .name = "dsc_0", .id = DSC_0, >> + .base = 0x80000, .len = 0x1800, >> + .features = 0, >> + }, { >> + .name = "dsc_1", .id = DSC_1, >> + .base = 0x80400, .len = 0x1800, >> + .features = 0, >> + }, >> }; >> >> static const struct dpu_dspp_cfg msm8998_dspp[] = { >> diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h >> index 786263ed1ef2..ca3bb6a1a93a 100644 >> --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h >> +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h >> @@ -224,10 +224,19 @@ static const struct dpu_pingpong_cfg sdm845_pp[] = { >> }; >> >> static const struct dpu_dsc_cfg sdm845_dsc[] = { >> - DSC_BLK("dsc_0", DSC_0, 0x80000, 0), >> - DSC_BLK("dsc_1", DSC_1, 0x80400, 0), >> - DSC_BLK("dsc_2", DSC_2, 0x80800, 0), >> - DSC_BLK("dsc_3", DSC_3, 0x80c00, 0), >> + { >> + .name = "dsc_0", .id = DSC_0, >> + .base = 0x80000, .len = 0x1800, >> + }, { >> + .name = "dsc_1", .id = DSC_1, >> + .base = 0x80400, .len = 0x1800, >> + }, { >> + .name = "dsc_2", .id = DSC_2, >> + .base = 0x80800, .len = 0x1800, >> + }, { >> + .name = "dsc_3", .id = DSC_3, >> + .base = 0x80c00, .len = 0x1800, >> + }, >> }; >> >> static const struct dpu_intf_cfg sdm845_intf[] = { >> diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h >> index 6b9bfeac6e0a..5b068521de13 100644 >> --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h >> +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h >> @@ -245,10 +245,23 @@ static const struct dpu_merge_3d_cfg sm8150_merge_3d[] = { >> }; >> >> static const struct dpu_dsc_cfg sm8150_dsc[] = { >> - DSC_BLK("dsc_0", DSC_0, 0x80000, BIT(DPU_DSC_OUTPUT_CTRL)), >> - DSC_BLK("dsc_1", DSC_1, 0x80400, BIT(DPU_DSC_OUTPUT_CTRL)), >> - DSC_BLK("dsc_2", DSC_2, 0x80800, BIT(DPU_DSC_OUTPUT_CTRL)), >> - DSC_BLK("dsc_3", DSC_3, 0x80c00, BIT(DPU_DSC_OUTPUT_CTRL)), >> + { >> + .name = "dsc_0", .id = DSC_0, >> + .base = 0x80000, .len = 0x1800, >> + .features = BIT(DPU_DSC_OUTPUT_CTRL), >> + }, { >> + .name = "dsc_1", .id = DSC_1, >> + .base = 0x80400, .len = 0x1800, >> + .features = BIT(DPU_DSC_OUTPUT_CTRL), >> + }, { >> + .name = "dsc_2", .id = DSC_2, >> + .base = 0x80800, .len = 0x1800, >> + .features = BIT(DPU_DSC_OUTPUT_CTRL), >> + }, { >> + .name = "dsc_3", .id = DSC_3, >> + .base = 0x80c00, .len = 0x1800, >> + .features = BIT(DPU_DSC_OUTPUT_CTRL), >> + }, >> }; >> >> static const struct dpu_intf_cfg sm8150_intf[] = { >> diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h >> index 414f0db3306c..ba5420f334ec 100644 >> --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h >> +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h >> @@ -244,12 +244,31 @@ static const struct dpu_merge_3d_cfg sc8180x_merge_3d[] = { >> }; >> >> static const struct dpu_dsc_cfg sc8180x_dsc[] = { >> - DSC_BLK("dsc_0", DSC_0, 0x80000, BIT(DPU_DSC_OUTPUT_CTRL)), >> - DSC_BLK("dsc_1", DSC_1, 0x80400, BIT(DPU_DSC_OUTPUT_CTRL)), >> - DSC_BLK("dsc_2", DSC_2, 0x80800, BIT(DPU_DSC_OUTPUT_CTRL)), >> - DSC_BLK("dsc_3", DSC_3, 0x80c00, BIT(DPU_DSC_OUTPUT_CTRL)), >> - DSC_BLK("dsc_4", DSC_4, 0x81000, BIT(DPU_DSC_OUTPUT_CTRL)), >> - DSC_BLK("dsc_5", DSC_5, 0x81400, BIT(DPU_DSC_OUTPUT_CTRL)), >> + { >> + .name = "dsc_0", .id = DSC_0, >> + .base = 0x80000, .len = 0x1800, >> + .features = BIT(DPU_DSC_OUTPUT_CTRL), >> + }, { >> + .name = "dsc_1", .id = DSC_1, >> + .base = 0x80400, .len = 0x1800, >> + .features = BIT(DPU_DSC_OUTPUT_CTRL), >> + }, { >> + .name = "dsc_2", .id = DSC_2, >> + .base = 0x80800, .len = 0x1800, >> + .features = BIT(DPU_DSC_OUTPUT_CTRL), >> + }, { >> + .name = "dsc_3", .id = DSC_3, >> + .base = 0x80c00, .len = 0x1800, >> + .features = BIT(DPU_DSC_OUTPUT_CTRL), >> + }, { >> + .name = "dsc_4", .id = DSC_4, >> + .base = 0x81000, .len = 0x1800, >> + .features = BIT(DPU_DSC_OUTPUT_CTRL), >> + }, { >> + .name = "dsc_5", .id = DSC_5, >> + .base = 0x81400, .len = 0x1800, >> + .features = BIT(DPU_DSC_OUTPUT_CTRL), >> + }, >> }; >> >> static const struct dpu_intf_cfg sc8180x_intf[] = { >> diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h >> index db3a65b011ca..01b61467a700 100644 >> --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h >> +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h >> @@ -245,10 +245,23 @@ static const struct dpu_merge_3d_cfg sm8250_merge_3d[] = { >> }; >> >> static const struct dpu_dsc_cfg sm8250_dsc[] = { >> - DSC_BLK("dsc_0", DSC_0, 0x80000, BIT(DPU_DSC_OUTPUT_CTRL)), >> - DSC_BLK("dsc_1", DSC_1, 0x80400, BIT(DPU_DSC_OUTPUT_CTRL)), >> - DSC_BLK("dsc_2", DSC_2, 0x80800, BIT(DPU_DSC_OUTPUT_CTRL)), >> - DSC_BLK("dsc_3", DSC_3, 0x80c00, BIT(DPU_DSC_OUTPUT_CTRL)), >> + { >> + .name = "dsc_0", .id = DSC_0, >> + .base = 0x80000, .len = 0x1800, >> + .features = BIT(DPU_DSC_OUTPUT_CTRL), >> + }, { >> + .name = "dsc_1", .id = DSC_1, >> + .base = 0x80400, .len = 0x1800, >> + .features = BIT(DPU_DSC_OUTPUT_CTRL), >> + }, { >> + .name = "dsc_2", .id = DSC_2, >> + .base = 0x80800, .len = 0x1800, >> + .features = BIT(DPU_DSC_OUTPUT_CTRL), >> + }, { >> + .name = "dsc_3", .id = DSC_3, >> + .base = 0x80c00, .len = 0x1800, >> + .features = BIT(DPU_DSC_OUTPUT_CTRL), >> + }, >> }; >> >> static const struct dpu_intf_cfg sm8250_intf[] = { >> diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h >> index bf1c0024a55a..20262eb56b48 100644 >> --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h >> +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h >> @@ -136,7 +136,11 @@ static struct dpu_pingpong_cfg sm6350_pp[] = { >> }; >> >> static const struct dpu_dsc_cfg sm6350_dsc[] = { >> - DSC_BLK("dsc_0", DSC_0, 0x80000, BIT(DPU_DSC_OUTPUT_CTRL)), >> + { >> + .name = "dsc_0", .id = DSC_0, >> + .base = 0x80000, .len = 0x1800, >> + .features = BIT(DPU_DSC_OUTPUT_CTRL), >> + }, >> }; >> >> static const struct dpu_intf_cfg sm6350_intf[] = { >> diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h >> index bf50ae6c525d..b9984ae6e7ed 100644 >> --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h >> +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h >> @@ -90,7 +90,11 @@ static const struct dpu_pingpong_cfg sm6375_pp[] = { >> }; >> >> static const struct dpu_dsc_cfg sm6375_dsc[] = { >> - DSC_BLK("dsc_0", DSC_0, 0x80000, BIT(DPU_DSC_OUTPUT_CTRL)), >> + { >> + .name = "dsc_0", .id = DSC_0, >> + .base = 0x80000, .len = 0x1800, >> + .features = BIT(DPU_DSC_OUTPUT_CTRL), >> + }, >> }; >> >> static const struct dpu_intf_cfg sm6375_intf[] = { >> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c >> index eb046079bb37..f563e513cbd0 100644 >> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c >> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c >> @@ -482,16 +482,6 @@ static const struct dpu_pingpong_sub_blks sc7280_pp_sblk = { >> .sblk = NULL \ >> } >> >> -/************************************************************* >> - * DSC sub blocks config >> - *************************************************************/ >> -#define DSC_BLK(_name, _id, _base, _features) \ >> - {\ >> - .name = _name, .id = _id, \ >> - .base = _base, .len = 0x140, \ >> - .features = _features, \ >> - } >> - > > This doesn't apply. > > What happened here? This is patch 16/21, however the patch before it is > 16/22 and that already deleted DSC_BLK and DSC_BLK_1_2... Did an old and > new format-patch -v2 series end up in the same local folder by accident? It seems so. Please ignore this patch 16. > > - Marijn > >> /************************************************************* >> * INTF sub blocks config >> *************************************************************/ >> -- >> 2.39.2 >>
On 2023-06-13 03:09:40, Dmitry Baryshkov wrote: > During IRQ conversion we have lost the PP_DONE interrupts for sc7280 > platform. This was left unnoticed, because this interrupt is only used > for CMD outputs and probably no sc7[12]80 systems use DSI CMD panels. > > Fixes: 667e9985ee24 ("drm/msm/dpu: replace IRQ lookup with the data in hw catalog") > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Agreed. I never really understood why these were missing, as if there was no cmd-mode support. The code prior to the Fixes: commit was indeed returning interrupts without looking at hardware support at all. Reviewed-by: Marijn Suijten <marijn.suijten@somainline.org> > --- > .../drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h | 8 ++++++-- > .../drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 16 ++++++++++++---- > 2 files changed, 18 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h > index 0b05da2592c0..67566b07195a 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h > +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h > @@ -80,8 +80,12 @@ static const struct dpu_dspp_cfg sc7180_dspp[] = { > }; > > static const struct dpu_pingpong_cfg sc7180_pp[] = { > - PP_BLK("pingpong_0", PINGPONG_0, 0x70000, PINGPONG_SM8150_MASK, 0, sdm845_pp_sblk, -1, -1), > - PP_BLK("pingpong_1", PINGPONG_1, 0x70800, PINGPONG_SM8150_MASK, 0, sdm845_pp_sblk, -1, -1), > + PP_BLK("pingpong_0", PINGPONG_0, 0x70000, PINGPONG_SM8150_MASK, 0, sdm845_pp_sblk, > + DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), > + -1), > + PP_BLK("pingpong_1", PINGPONG_1, 0x70800, PINGPONG_SM8150_MASK, 0, sdm845_pp_sblk, > + DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9), > + -1), > }; > > static const struct dpu_intf_cfg sc7180_intf[] = { > 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 9c5a3fe9cfde..6ea1cb551348 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 > @@ -88,10 +88,18 @@ static const struct dpu_dspp_cfg sc7280_dspp[] = { > }; > > static const struct dpu_pingpong_cfg sc7280_pp[] = { > - PP_BLK_DITHER("pingpong_0", PINGPONG_0, 0x69000, 0, sc7280_pp_sblk, -1, -1), > - PP_BLK_DITHER("pingpong_1", PINGPONG_1, 0x6a000, 0, sc7280_pp_sblk, -1, -1), > - PP_BLK_DITHER("pingpong_2", PINGPONG_2, 0x6b000, 0, sc7280_pp_sblk, -1, -1), > - PP_BLK_DITHER("pingpong_3", PINGPONG_3, 0x6c000, 0, sc7280_pp_sblk, -1, -1), > + PP_BLK_DITHER("pingpong_0", PINGPONG_0, 0x69000, 0, sc7280_pp_sblk, > + DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), > + -1), > + PP_BLK_DITHER("pingpong_1", PINGPONG_1, 0x6a000, 0, sc7280_pp_sblk, > + DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9), > + -1), > + PP_BLK_DITHER("pingpong_2", PINGPONG_2, 0x6b000, 0, sc7280_pp_sblk, > + DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10), > + -1), > + PP_BLK_DITHER("pingpong_3", PINGPONG_3, 0x6c000, 0, sc7280_pp_sblk, > + DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11), > + -1), > }; > > static const struct dpu_wb_cfg sc7280_wb[] = { > -- > 2.39.2 >
On 2023-06-13 03:09:43, Dmitry Baryshkov wrote: > Follow the DP example and define MSM_DSI_CONTROLLER_n enumeration. > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Nice, that'll be cleaner. Reviewed-by: Marijn Suijten <marijn.suijten@somainline.org> > --- > drivers/gpu/drm/msm/msm_drv.h | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h > index e13a8cbd61c9..ad4fad2bcdc8 100644 > --- a/drivers/gpu/drm/msm/msm_drv.h > +++ b/drivers/gpu/drm/msm/msm_drv.h > @@ -65,6 +65,12 @@ enum msm_dp_controller { > MSM_DP_CONTROLLER_COUNT, > }; > > +enum msm_dsi_controller { > + MSM_DSI_CONTROLLER_0, > + MSM_DSI_CONTROLLER_1, > + MSM_DSI_CONTROLLER_COUNT, > +}; > + > #define MSM_GPU_MAX_RINGS 4 > #define MAX_H_TILES_PER_DISPLAY 2 > > @@ -117,7 +123,7 @@ struct msm_drm_private { > struct hdmi *hdmi; > > /* DSI is shared by mdp4 and mdp5 */ > - struct msm_dsi *dsi[2]; > + struct msm_dsi *dsi[MSM_DSI_CONTROLLER_COUNT]; > > struct msm_dp *dp[MSM_DP_CONTROLLER_COUNT]; > > -- > 2.39.2 >
On 2023-06-13 03:09:44, Dmitry Baryshkov wrote: > In several catalog entries we did not use existing MSM_DP_CONTROLLER_n > constants. Fill them in. Also use freshly defined MSM_DSI_CONTROLLER_n > for DSI interfaces. > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 6 +++--- > drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h | 8 ++++---- > drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h | 8 ++++---- > drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h | 4 ++-- > drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h | 8 ++++---- > drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h | 2 +- > drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h | 2 +- > drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h | 2 +- 6_4_sm6350 and 6_9_sm6375 are missing from this series. For the rest: Reviewed-by: Marijn Suijten <marijn.suijten@somainline.org> > drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h | 4 ++-- > drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 2 +- > drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h | 4 ++-- > drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h | 4 ++-- > drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h | 4 ++-- > 13 files changed, 29 insertions(+), 29 deletions(-) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h > index 7d0d0e74c3b0..be0514bf27ec 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h > +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h > @@ -139,13 +139,13 @@ static const struct dpu_dspp_cfg msm8998_dspp[] = { > }; > > static const struct dpu_intf_cfg msm8998_intf[] = { > - INTF_BLK("intf_0", INTF_0, 0x6a000, 0x280, INTF_DP, 0, 21, INTF_SDM845_MASK, > + INTF_BLK("intf_0", INTF_0, 0x6a000, 0x280, INTF_DP, MSM_DP_CONTROLLER_0, 21, INTF_SDM845_MASK, > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 24), > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 25)), > - INTF_BLK("intf_1", INTF_1, 0x6a800, 0x280, INTF_DSI, 0, 21, INTF_SDM845_MASK, > + INTF_BLK("intf_1", INTF_1, 0x6a800, 0x280, INTF_DSI, MSM_DSI_CONTROLLER_0, 21, INTF_SDM845_MASK, > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 26), > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 27)), > - INTF_BLK("intf_2", INTF_2, 0x6b000, 0x280, INTF_DSI, 1, 21, INTF_SDM845_MASK, > + INTF_BLK("intf_2", INTF_2, 0x6b000, 0x280, INTF_DSI, MSM_DSI_CONTROLLER_1, 21, INTF_SDM845_MASK, > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 28), > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 29)), > INTF_BLK("intf_3", INTF_3, 0x6b800, 0x280, INTF_HDMI, 0, 21, INTF_SDM845_MASK, > diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h > index b6098141bb9b..b33472625fcb 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h > +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h > @@ -143,16 +143,16 @@ static const struct dpu_dsc_cfg sdm845_dsc[] = { > }; > > static const struct dpu_intf_cfg sdm845_intf[] = { > - INTF_BLK("intf_0", INTF_0, 0x6a000, 0x280, INTF_DP, 0, 24, INTF_SDM845_MASK, > + INTF_BLK("intf_0", INTF_0, 0x6a000, 0x280, INTF_DP, MSM_DP_CONTROLLER_0, 24, INTF_SDM845_MASK, > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 24), > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 25)), > - INTF_BLK("intf_1", INTF_1, 0x6a800, 0x280, INTF_DSI, 0, 24, INTF_SDM845_MASK, > + INTF_BLK("intf_1", INTF_1, 0x6a800, 0x280, INTF_DSI, MSM_DSI_CONTROLLER_0, 24, INTF_SDM845_MASK, > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 26), > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 27)), > - INTF_BLK("intf_2", INTF_2, 0x6b000, 0x280, INTF_DSI, 1, 24, INTF_SDM845_MASK, > + INTF_BLK("intf_2", INTF_2, 0x6b000, 0x280, INTF_DSI, MSM_DSI_CONTROLLER_1, 24, INTF_SDM845_MASK, > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 28), > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 29)), > - INTF_BLK("intf_3", INTF_3, 0x6b800, 0x280, INTF_DP, 1, 24, INTF_SDM845_MASK, > + INTF_BLK("intf_3", INTF_3, 0x6b800, 0x280, INTF_DP, MSM_DP_CONTROLLER_1, 24, INTF_SDM845_MASK, > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 30), > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 31)), > }; > diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h > index b5f751354267..64ed10da1b73 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h > +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h > @@ -162,18 +162,18 @@ static const struct dpu_dsc_cfg sm8150_dsc[] = { > }; > > static const struct dpu_intf_cfg sm8150_intf[] = { > - INTF_BLK("intf_0", INTF_0, 0x6a000, 0x280, INTF_DP, 0, 24, INTF_SC7180_MASK, > + INTF_BLK("intf_0", INTF_0, 0x6a000, 0x280, INTF_DP, MSM_DP_CONTROLLER_0, 24, INTF_SC7180_MASK, > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 24), > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 25)), > - INTF_BLK_DSI_TE("intf_1", INTF_1, 0x6a800, 0x2bc, INTF_DSI, 0, 24, INTF_SC7180_MASK, > + INTF_BLK_DSI_TE("intf_1", INTF_1, 0x6a800, 0x2bc, INTF_DSI, MSM_DSI_CONTROLLER_0, 24, INTF_SC7180_MASK, > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 26), > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 27), > DPU_IRQ_IDX(MDP_INTF1_TEAR_INTR, 2)), > - INTF_BLK_DSI_TE("intf_2", INTF_2, 0x6b000, 0x2bc, INTF_DSI, 1, 24, INTF_SC7180_MASK, > + INTF_BLK_DSI_TE("intf_2", INTF_2, 0x6b000, 0x2bc, INTF_DSI, MSM_DSI_CONTROLLER_1, 24, INTF_SC7180_MASK, > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 28), > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 29), > DPU_IRQ_IDX(MDP_INTF2_TEAR_INTR, 2)), > - INTF_BLK("intf_3", INTF_3, 0x6b800, 0x280, INTF_DP, 1, 24, INTF_SC7180_MASK, > + INTF_BLK("intf_3", INTF_3, 0x6b800, 0x280, INTF_DP, MSM_DP_CONTROLLER_1, 24, INTF_SC7180_MASK, > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 30), > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 31)), > }; > diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h > index 8ed2b263c5ea..6ae1f6f67ec8 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h > +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h > @@ -166,11 +166,11 @@ static const struct dpu_intf_cfg sc8180x_intf[] = { > INTF_BLK("intf_0", INTF_0, 0x6a000, 0x280, INTF_DP, MSM_DP_CONTROLLER_0, 24, INTF_SC7180_MASK, > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 24), > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 25)), > - INTF_BLK_DSI_TE("intf_1", INTF_1, 0x6a800, 0x2bc, INTF_DSI, 0, 24, INTF_SC7180_MASK, > + INTF_BLK_DSI_TE("intf_1", INTF_1, 0x6a800, 0x2bc, INTF_DSI, MSM_DSI_CONTROLLER_0, 24, INTF_SC7180_MASK, > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 26), > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 27), > DPU_IRQ_IDX(MDP_INTF1_TEAR_INTR, 2)), > - INTF_BLK_DSI_TE("intf_2", INTF_2, 0x6b000, 0x2bc, INTF_DSI, 1, 24, INTF_SC7180_MASK, > + INTF_BLK_DSI_TE("intf_2", INTF_2, 0x6b000, 0x2bc, INTF_DSI, MSM_DSI_CONTROLLER_1, 24, INTF_SC7180_MASK, > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 28), > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 29), > DPU_IRQ_IDX(MDP_INTF2_TEAR_INTR, 2)), > diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h > index daebd2170041..48c97e9f8a45 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h > +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h > @@ -163,18 +163,18 @@ static const struct dpu_dsc_cfg sm8250_dsc[] = { > }; > > static const struct dpu_intf_cfg sm8250_intf[] = { > - INTF_BLK("intf_0", INTF_0, 0x6a000, 0x280, INTF_DP, 0, 24, INTF_SC7180_MASK, > + INTF_BLK("intf_0", INTF_0, 0x6a000, 0x280, INTF_DP, MSM_DP_CONTROLLER_0, 24, INTF_SC7180_MASK, > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 24), > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 25)), > - INTF_BLK_DSI_TE("intf_1", INTF_1, 0x6a800, 0x2c0, INTF_DSI, 0, 24, INTF_SC7180_MASK, > + INTF_BLK_DSI_TE("intf_1", INTF_1, 0x6a800, 0x2c0, INTF_DSI, MSM_DSI_CONTROLLER_0, 24, INTF_SC7180_MASK, > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 26), > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 27), > DPU_IRQ_IDX(MDP_INTF1_TEAR_INTR, 2)), > - INTF_BLK_DSI_TE("intf_2", INTF_2, 0x6b000, 0x2c0, INTF_DSI, 1, 24, INTF_SC7180_MASK, > + INTF_BLK_DSI_TE("intf_2", INTF_2, 0x6b000, 0x2c0, INTF_DSI, MSM_DSI_CONTROLLER_1, 24, INTF_SC7180_MASK, > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 28), > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 29), > DPU_IRQ_IDX(MDP_INTF2_TEAR_INTR, 2)), > - INTF_BLK("intf_3", INTF_3, 0x6b800, 0x280, INTF_DP, 1, 24, INTF_SC7180_MASK, > + INTF_BLK("intf_3", INTF_3, 0x6b800, 0x280, INTF_DP, MSM_DP_CONTROLLER_1, 24, INTF_SC7180_MASK, > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 30), > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 31)), > }; > diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h > index 67566b07195a..00366f7fe969 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h > +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h > @@ -92,7 +92,7 @@ static const struct dpu_intf_cfg sc7180_intf[] = { > INTF_BLK("intf_0", INTF_0, 0x6a000, 0x280, INTF_DP, MSM_DP_CONTROLLER_0, 24, INTF_SC7180_MASK, > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 24), > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 25)), > - INTF_BLK_DSI_TE("intf_1", INTF_1, 0x6a800, 0x2c0, INTF_DSI, 0, 24, INTF_SC7180_MASK, > + INTF_BLK_DSI_TE("intf_1", INTF_1, 0x6a800, 0x2c0, INTF_DSI, MSM_DSI_CONTROLLER_0, 24, INTF_SC7180_MASK, > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 26), > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 27), > DPU_IRQ_IDX(MDP_INTF1_TEAR_INTR, 2)), > diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h > index 031fc8dae3c6..8688f09dd560 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h > +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h > @@ -66,7 +66,7 @@ static const struct dpu_pingpong_cfg sm6115_pp[] = { > }; > > static const struct dpu_intf_cfg sm6115_intf[] = { > - INTF_BLK_DSI_TE("intf_1", INTF_1, 0x6a800, 0x2c0, INTF_DSI, 0, 24, INTF_SC7180_MASK, > + INTF_BLK_DSI_TE("intf_1", INTF_1, 0x6a800, 0x2c0, INTF_DSI, MSM_DSI_CONTROLLER_0, 24, INTF_SC7180_MASK, > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 26), > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 27), > DPU_IRQ_IDX(MDP_INTF1_TEAR_INTR, 2)), > diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h > index f2808098af39..d106ff28372d 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h > +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h > @@ -63,7 +63,7 @@ static const struct dpu_pingpong_cfg qcm2290_pp[] = { > }; > > static const struct dpu_intf_cfg qcm2290_intf[] = { > - INTF_BLK_DSI_TE("intf_1", INTF_1, 0x6a800, 0x2c0, INTF_DSI, 0, 24, INTF_SC7180_MASK, > + INTF_BLK_DSI_TE("intf_1", INTF_1, 0x6a800, 0x2c0, INTF_DSI, MSM_DSI_CONTROLLER_0, 24, INTF_SC7180_MASK, > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 26), > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 27), > DPU_IRQ_IDX(MDP_INTF1_TEAR_INTR, 2)), > diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h > index 8da424eaee6a..8fa9d83a539d 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h > +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h > @@ -169,11 +169,11 @@ static const struct dpu_intf_cfg sm8350_intf[] = { > INTF_BLK("intf_0", INTF_0, 0x34000, 0x280, INTF_DP, MSM_DP_CONTROLLER_0, 24, INTF_SC7280_MASK, > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 24), > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 25)), > - INTF_BLK_DSI_TE("intf_1", INTF_1, 0x35000, 0x2c4, INTF_DSI, 0, 24, INTF_SC7280_MASK, > + INTF_BLK_DSI_TE("intf_1", INTF_1, 0x35000, 0x2c4, INTF_DSI, MSM_DSI_CONTROLLER_0, 24, INTF_SC7280_MASK, > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 26), > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 27), > DPU_IRQ_IDX(MDP_INTF1_7xxx_TEAR_INTR, 2)), > - INTF_BLK_DSI_TE("intf_2", INTF_2, 0x36000, 0x2c4, INTF_DSI, 1, 24, INTF_SC7280_MASK, > + INTF_BLK_DSI_TE("intf_2", INTF_2, 0x36000, 0x2c4, INTF_DSI, MSM_DSI_CONTROLLER_1, 24, INTF_SC7280_MASK, > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 28), > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 29), > DPU_IRQ_IDX(MDP_INTF2_7xxx_TEAR_INTR, 2)), > 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 6ea1cb551348..c7b495b3e792 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 > @@ -116,7 +116,7 @@ static const struct dpu_intf_cfg sc7280_intf[] = { > INTF_BLK("intf_0", INTF_0, 0x34000, 0x280, INTF_DP, MSM_DP_CONTROLLER_0, 24, INTF_SC7280_MASK, > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 24), > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 25)), > - INTF_BLK_DSI_TE("intf_1", INTF_1, 0x35000, 0x2c4, INTF_DSI, 0, 24, INTF_SC7280_MASK, > + INTF_BLK_DSI_TE("intf_1", INTF_1, 0x35000, 0x2c4, INTF_DSI, MSM_DSI_CONTROLLER_0, 24, INTF_SC7280_MASK, > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 26), > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 27), > DPU_IRQ_IDX(MDP_INTF1_7xxx_TEAR_INTR, 2)), > diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h > index f6ce6b090f71..520b210e8c0c 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h > +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h > @@ -161,11 +161,11 @@ static const struct dpu_intf_cfg sc8280xp_intf[] = { > INTF_BLK("intf_0", INTF_0, 0x34000, 0x280, INTF_DP, MSM_DP_CONTROLLER_0, 24, INTF_SC7280_MASK, > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 24), > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 25)), > - INTF_BLK_DSI_TE("intf_1", INTF_1, 0x35000, 0x300, INTF_DSI, 0, 24, INTF_SC7280_MASK, > + INTF_BLK_DSI_TE("intf_1", INTF_1, 0x35000, 0x300, INTF_DSI, MSM_DSI_CONTROLLER_0, 24, INTF_SC7280_MASK, > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 26), > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 27), > DPU_IRQ_IDX(MDP_INTF1_7xxx_TEAR_INTR, 2)), > - INTF_BLK_DSI_TE("intf_2", INTF_2, 0x36000, 0x300, INTF_DSI, 1, 24, INTF_SC7280_MASK, > + INTF_BLK_DSI_TE("intf_2", INTF_2, 0x36000, 0x300, INTF_DSI, MSM_DSI_CONTROLLER_1, 24, INTF_SC7280_MASK, > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 28), > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 29), > DPU_IRQ_IDX(MDP_INTF2_7xxx_TEAR_INTR, 2)), > 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 8d13c369213c..b782603642f4 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 > @@ -177,11 +177,11 @@ static const struct dpu_intf_cfg sm8450_intf[] = { > INTF_BLK("intf_0", INTF_0, 0x34000, 0x280, INTF_DP, MSM_DP_CONTROLLER_0, 24, INTF_SC7280_MASK, > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 24), > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 25)), > - INTF_BLK_DSI_TE("intf_1", INTF_1, 0x35000, 0x300, INTF_DSI, 0, 24, INTF_SC7280_MASK, > + INTF_BLK_DSI_TE("intf_1", INTF_1, 0x35000, 0x300, INTF_DSI, MSM_DSI_CONTROLLER_0, 24, INTF_SC7280_MASK, > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 26), > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 27), > DPU_IRQ_IDX(MDP_INTF1_7xxx_TEAR_INTR, 2)), > - INTF_BLK_DSI_TE("intf_2", INTF_2, 0x36000, 0x300, INTF_DSI, 1, 24, INTF_SC7280_MASK, > + INTF_BLK_DSI_TE("intf_2", INTF_2, 0x36000, 0x300, INTF_DSI, MSM_DSI_CONTROLLER_1, 24, INTF_SC7280_MASK, > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 28), > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 29), > DPU_IRQ_IDX(MDP_INTF2_7xxx_TEAR_INTR, 2)), > diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h > index f17b9a7fee85..025a149bab97 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h > +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h > @@ -181,11 +181,11 @@ static const struct dpu_intf_cfg sm8550_intf[] = { > INTF_BLK("intf_0", INTF_0, 0x34000, 0x280, INTF_DP, MSM_DP_CONTROLLER_0, 24, INTF_SC7280_MASK, > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 24), > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 25)), > - INTF_BLK_DSI_TE("intf_1", INTF_1, 0x35000, 0x300, INTF_DSI, 0, 24, INTF_SC7280_MASK, > + INTF_BLK_DSI_TE("intf_1", INTF_1, 0x35000, 0x300, INTF_DSI, MSM_DSI_CONTROLLER_0, 24, INTF_SC7280_MASK, > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 26), > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 27), > DPU_IRQ_IDX(MDP_INTF1_7xxx_TEAR_INTR, 2)), > - INTF_BLK_DSI_TE("intf_2", INTF_2, 0x36000, 0x300, INTF_DSI, 1, 24, INTF_SC7280_MASK, > + INTF_BLK_DSI_TE("intf_2", INTF_2, 0x36000, 0x300, INTF_DSI, MSM_DSI_CONTROLLER_1, 24, INTF_SC7280_MASK, > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 28), > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 29), > DPU_IRQ_IDX(MDP_INTF2_7xxx_TEAR_INTR, 2)), > -- > 2.39.2 >