On Tue, May 20, 2025 at 09:53:42AM +0200, [email protected] wrote: > On 19/05/2025 18:04, Dmitry Baryshkov wrote: > > From: Dmitry Baryshkov <[email protected]> > > > > Continue migration to the MDSS-revision based checks and replace > > DPU_MDP_AUDIO_SELECT feature bit with the core_major_ver == 8 || > > core_major_ver == 5 check. > > > > Signed-off-by: Dmitry Baryshkov <[email protected]> > > Signed-off-by: Dmitry Baryshkov <[email protected]> > > --- > > drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h | 1 - > > drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_1_sdm670.h | 1 - > > drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h | 1 - > > drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h | 1 - > > drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h | 1 - > > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 1 - > > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 3 ++- > > 7 files changed, 2 insertions(+), 7 deletions(-) > > > > 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 > > 3e66feb3e18dcc1d9ed5403a42989d97f84a8edc..72a7257b4d7ba5bfe89ec76bac19550e023a2b50 > > 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 > > @@ -23,7 +23,6 @@ static const struct dpu_caps sdm845_dpu_caps = { > > static const struct dpu_mdp_cfg sdm845_mdp = { > > .name = "top_0", > > .base = 0x0, .len = 0x45c, > > - .features = BIT(DPU_MDP_AUDIO_SELECT), > > .clk_ctrls = { > > [DPU_CLK_CTRL_VIG0] = { .reg_off = 0x2ac, .bit_off = 0 }, > > [DPU_CLK_CTRL_VIG1] = { .reg_off = 0x2b4, .bit_off = 0 }, > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_1_sdm670.h > > b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_1_sdm670.h > > index > > 3a60432a758a942eb1541f143018bd466b2bdf20..ce169a610e195cbb6f0fee1362bcaaf05df777cb > > 100644 > > --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_1_sdm670.h > > +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_1_sdm670.h > > @@ -11,7 +11,6 @@ > > static const struct dpu_mdp_cfg sdm670_mdp = { > > .name = "top_0", > > .base = 0x0, .len = 0x45c, > > - .features = BIT(DPU_MDP_AUDIO_SELECT), > > .clk_ctrls = { > > [DPU_CLK_CTRL_VIG0] = { .reg_off = 0x2ac, .bit_off = 0 }, > > [DPU_CLK_CTRL_VIG1] = { .reg_off = 0x2b4, .bit_off = 0 }, > > 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 > > e07c2cc4188bb12e2253068ca8666ce9364c69c1..23a3a458dd5c260399a42e5f4d4361b3c4e82c4f > > 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 > > @@ -23,7 +23,6 @@ static const struct dpu_caps sm8150_dpu_caps = { > > static const struct dpu_mdp_cfg sm8150_mdp = { > > .name = "top_0", > > .base = 0x0, .len = 0x45c, > > - .features = BIT(DPU_MDP_AUDIO_SELECT), > > .clk_ctrls = { > > [DPU_CLK_CTRL_VIG0] = { .reg_off = 0x2ac, .bit_off = 0 }, > > [DPU_CLK_CTRL_VIG1] = { .reg_off = 0x2b4, .bit_off = 0 }, > > 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 > > b350dba28caed77e542d6a41ceac191a93e165a7..75f8f69123a4a6afe8234a9de21ce68b23c11605 > > 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 > > @@ -23,7 +23,6 @@ static const struct dpu_caps sc8180x_dpu_caps = { > > static const struct dpu_mdp_cfg sc8180x_mdp = { > > .name = "top_0", > > .base = 0x0, .len = 0x45c, > > - .features = BIT(DPU_MDP_AUDIO_SELECT), > > .clk_ctrls = { > > [DPU_CLK_CTRL_VIG0] = { .reg_off = 0x2ac, .bit_off = 0 }, > > [DPU_CLK_CTRL_VIG1] = { .reg_off = 0x2b4, .bit_off = 0 }, > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h > > b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h > > index > > 27c71a8a1f31921e5e1f4b6b15e0efc25fb63537..6b895eca2fac53505f7a1d857d30bb8a5d23d4c8 > > 100644 > > --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h > > +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h > > @@ -23,7 +23,6 @@ static const struct dpu_caps sm7150_dpu_caps = { > > static const struct dpu_mdp_cfg sm7150_mdp = { > > .name = "top_0", > > .base = 0x0, .len = 0x45c, > > - .features = BIT(DPU_MDP_AUDIO_SELECT), > > .clk_ctrls = { > > [DPU_CLK_CTRL_VIG0] = { .reg_off = 0x2ac, .bit_off = 0 }, > > [DPU_CLK_CTRL_VIG1] = { .reg_off = 0x2b4, .bit_off = 0 }, > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h > > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h > > index > > d3a7f46488a21e81a24a9af5071a9a7f5f48cdac..9ba9e273f81ab1966db1865b4ce28f8c18f750b8 > > 100644 > > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h > > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h > > @@ -38,7 +38,6 @@ > > enum { > > DPU_MDP_PANIC_PER_PIPE = 0x1, > > DPU_MDP_10BIT_SUPPORT, > > - DPU_MDP_AUDIO_SELECT, > > DPU_MDP_MAX > > }; > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c > > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c > > index > > c49a67da86b0d46d12c32466981be7f00519974c..5c811f0142d5e2a012d7e9b3a918818f22ec11cf > > 100644 > > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c > > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c > > @@ -280,7 +280,8 @@ static void _setup_mdp_ops(struct dpu_hw_mdp_ops *ops, > > if (mdss_rev->core_major_ver >= 5) > > ops->dp_phy_intf_sel = dpu_hw_dp_phy_intf_sel; > > - if (cap & BIT(DPU_MDP_AUDIO_SELECT)) > > + if (mdss_rev->core_major_ver == 4 || > > + mdss_rev->core_major_ver == 5) > > Commit message says: core_major_ver == 8 || core_major_ver == 5 > > Which one is right ?
It should be 4, as in the code, I'll fix it later on. > > Neil > > > ops->intf_audio_select = dpu_hw_intf_audio_select; > > } > > > -- With best wishes Dmitry
