[PATCH v4 06/10] drm/msm/dsi: Switch the QCM2290-specific compatible to index autodetection

[Marijn Suijten]

On 2023-03-14 14:04:41, Marijn Suijten wrote:
> On 2023-03-14 13:13:44, Konrad Dybcio wrote:
> > Now that the logic can handle multiple sets of registers, move
> > the QCM2290 to the common logic and mark it deprecated. This allows us
> > to remove a couple of structs, saving some memory.
> > 
> > Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov at linaro.org>
> > Signed-off-by: Konrad Dybcio <konrad.dybcio at linaro.org>
> > ---
> >  drivers/gpu/drm/msm/dsi/dsi.c     |  5 +++--
> >  drivers/gpu/drm/msm/dsi/dsi_cfg.c | 20 ++------------------
> >  2 files changed, 5 insertions(+), 20 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/msm/dsi/dsi.c b/drivers/gpu/drm/msm/dsi/dsi.c
> > index 31fdee2052be..f761973e4cba 100644
> > --- a/drivers/gpu/drm/msm/dsi/dsi.c
> > +++ b/drivers/gpu/drm/msm/dsi/dsi.c
> > @@ -4,7 +4,6 @@
> >   */
> >  
> >  #include "dsi.h"
> > -#include "dsi_cfg.h"
> >  
> >  bool msm_dsi_is_cmd_mode(struct msm_dsi *msm_dsi)
> >  {
> > @@ -174,7 +173,9 @@ static int dsi_dev_remove(struct platform_device *pdev)
> >  
> >  static const struct of_device_id dt_match[] = {
> >  	{ .compatible = "qcom,mdss-dsi-ctrl", .data = NULL /* autodetect cfg */ },
> > -	{ .compatible = "qcom,dsi-ctrl-6g-qcm2290", .data = &qcm2290_dsi_cfg_handler },
> > +
> > +	/* Deprecated, don't use */
> > +	{ .compatible = "qcom,dsi-ctrl-6g-qcm2290", .data = NULL },
> >  	{}
> >  };
> >  
> > diff --git a/drivers/gpu/drm/msm/dsi/dsi_cfg.c b/drivers/gpu/drm/msm/dsi/dsi_cfg.c
> > index 03d98cbcc978..29ccd755cc2e 100644
> > --- a/drivers/gpu/drm/msm/dsi/dsi_cfg.c
> > +++ b/drivers/gpu/drm/msm/dsi/dsi_cfg.c
> > @@ -169,7 +169,8 @@ static const struct msm_dsi_config sdm845_dsi_cfg = {
> >  	.bus_clk_names = dsi_v2_4_clk_names,
> >  	.num_bus_clks = ARRAY_SIZE(dsi_v2_4_clk_names),
> >  	.io_start = {
> > -		{ 0xae94000, 0xae96000 }, /* SDM845 / SDM670 / SC7180 */
> > +		{ 0xae94000, 0xae96000 }, /* SDM845 / SDM670 */
> > +		{ 0x5e94000 }, /* QCM2290 / SM6115 / SM6125 / SM6375 */
> >  	},
> >  };
> >  
> > @@ -203,17 +204,6 @@ static const struct msm_dsi_config sc7280_dsi_cfg = {
> >  	},
> >  };
> >  
> > -static const struct msm_dsi_config qcm2290_dsi_cfg = {
> > -	.io_offset = DSI_6G_REG_SHIFT,
> > -	.regulator_data = dsi_v2_4_regulators,
> > -	.num_regulators = ARRAY_SIZE(dsi_v2_4_regulators),
> > -	.bus_clk_names = dsi_v2_4_clk_names,
> > -	.num_bus_clks = ARRAY_SIZE(dsi_v2_4_clk_names),
> > -	.io_start = {
> > -		{ 0x5e94000 },
> > -	},
> > -};
> > -
> >  static const struct msm_dsi_host_cfg_ops msm_dsi_v2_host_ops = {
> >  	.link_clk_set_rate = dsi_link_clk_set_rate_v2,
> >  	.link_clk_enable = dsi_link_clk_enable_v2,
> > @@ -304,9 +294,3 @@ const struct msm_dsi_cfg_handler *msm_dsi_cfg_get(u32 major, u32 minor)
> >  
> >  	return cfg_hnd;
> >  }
> > -
> > -/*  Non autodetect configs */
> > -const struct msm_dsi_cfg_handler qcm2290_dsi_cfg_handler = {
> > -	.cfg = &qcm2290_dsi_cfg,
> > -	.ops = &msm_dsi_6g_v2_host_ops,
> > -};
> 
> Should be removed from dsi_cfg.h, but you did that in patch 7 instead.

As discussed in patch 7 this could possibly be fixed up when Dmitry
applies the series, rather than going through yet another resend... So
have my r-b already just in case:

Reviewed-by: Marijn Suijten <marijn.suijten at somainline.org>