| Message ID | 20220802223738.898592-1-dianders@chromium.org |
|---|---|
| Headers | show |
| Series | drm/msm/dsi regulator improvements | expand |
On 03/08/2022 01:37, Douglas Anderson wrote: > 3 regulators are specified listed but the number 2 is specified. Fix > it. > > Fixes: 3a3ff88a0fc1 ("drm/msm/dsi: Add 8x96 info in dsi_cfg") > Signed-off-by: Douglas Anderson <dianders@chromium.org> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > > (no changes since v2) > > Changes in v2: > - ("Fix number of regulators for msm8996_dsi_cfg") new for v2. > > drivers/gpu/drm/msm/dsi/dsi_cfg.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/msm/dsi/dsi_cfg.c b/drivers/gpu/drm/msm/dsi/dsi_cfg.c > index 2c23324a2296..02000a7b7a18 100644 > --- a/drivers/gpu/drm/msm/dsi/dsi_cfg.c > +++ b/drivers/gpu/drm/msm/dsi/dsi_cfg.c > @@ -109,7 +109,7 @@ static const char * const dsi_8996_bus_clk_names[] = { > static const struct msm_dsi_config msm8996_dsi_cfg = { > .io_offset = DSI_6G_REG_SHIFT, > .reg_cfg = { > - .num = 2, > + .num = 3, > .regs = { > {"vdda", 18160, 1 }, /* 1.25 V */ > {"vcca", 17000, 32 }, /* 0.925 V */
On 03/08/2022 01:37, Douglas Anderson wrote: > As of commit 5451781dadf8 ("regulator: core: Only count load for > enabled consumers"), a load isn't counted for a disabled > regulator. That means all the code in the DSI driver to specify and > set loads before disabling a regulator is not actually doing anything > useful. Let's remove it. > > It should be noted that all of the loads set that were being specified > were pointless noise anyway. The only use for this number is to pick > between low power and high power modes of regulators. Regulators > appear to do this changeover at loads on the order of 10000 uA. You > would need a lot of clients of the same rail for that 100 uA number to > count for anything. > > Note that now that we get rid of the setting of the load at disable > time, we can just set the load once when we first get the regulator > and then forget it. > > It should also be noted that the regulator functions > regulator_bulk_enable() and regulator_set_load() already print error > messages when they encounter problems so while moving things around we > get rid of some extra error prints. > > Signed-off-by: Douglas Anderson <dianders@chromium.org> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > > Changes in v3: > - Fix typo in commit message. > - Just directly call the bulk commands; get rid of the wrapper. > > drivers/gpu/drm/msm/dsi/dsi.h | 1 - > drivers/gpu/drm/msm/dsi/dsi_cfg.c | 52 +++++++------- > drivers/gpu/drm/msm/dsi/dsi_host.c | 71 ++++--------------- > drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 52 ++------------ > drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c | 4 +- > drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 6 +- > drivers/gpu/drm/msm/dsi/phy/dsi_phy_20nm.c | 4 +- > drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c | 6 +- > .../gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c | 2 +- > drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c | 6 +- > 10 files changed, 60 insertions(+), 144 deletions(-) >
On 03/08/2022 01:37, Douglas Anderson wrote: > As of the commit 1de452a0edda ("regulator: core: Allow drivers to > define their init data as const") we no longer need to do copying of > regulator bulk data from initdata to something dynamic. Let's take > advantage of that. > > In addition to saving some code, this also moves us to using > ARRAY_SIZE() to specify how many regulators we have which is less > error prone. > > This gets rid of some layers of wrappers which makes it obvious that > we can get rid of an extra error print. > devm_regulator_bulk_get_const() prints errors for you so you don't > need an extra layer of printing. > > In all cases here I have preserved the old settings without any > investigation about whether the loads being set are sensible. In the > cases of some of the PHYs if several PHYs in the same file used > exactly the same settings I had them point to the same data structure. > > NOTE: Though I haven't done the math, this is likely an overall > savings in terms of "static const" data. We previously always > allocated space for 8 supplies. Each of these supplies took up 36 > bytes of data (32 for name, 4 for an int). > > Signed-off-by: Douglas Anderson <dianders@chromium.org> Ah, so to array conversion is already done. That's great. Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > > Changes in v3: > - Do all the PHYs too. It would have been easier if DSI and DSI PHY were split to separate patches. > - Get rid of error print after devm_regulator_bulk_get_const(). > - Just directly call the bulk commands; get rid of the wrapper. > - Update commit message to point at the git hash of the regulator change. > > Changes in v2: > - ("Take advantage of devm_regulator_bulk_get_const") new for v2. > > drivers/gpu/drm/msm/dsi/dsi.h | 12 -- > drivers/gpu/drm/msm/dsi/dsi_cfg.c | 172 +++++++++--------- > drivers/gpu/drm/msm/dsi/dsi_cfg.h | 3 +- > drivers/gpu/drm/msm/dsi/dsi_host.c | 42 ++--- > drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 37 +--- > drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 5 +- > drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c | 20 +- > drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 32 ++-- > drivers/gpu/drm/msm/dsi/phy/dsi_phy_20nm.c | 14 +- > drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c | 28 +-- > .../gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c | 12 +- > drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c | 32 ++-- > 12 files changed, 167 insertions(+), 242 deletions(-)
On 03/08/2022 01:37, Douglas Anderson wrote: > The main goal of this series is to make a small dent in cleaning up > the way we deal with regulator loads for DSI drivers. > > As of v3 of this series, the regulator API improvements needed for the > later patches in the series are merged into mainline. Thus this series > only contains the DSI changes now. > > I'd expect: > * The first two patches are bugfixes found while converting the DSI > driver over. Those could land any time. > * The third patch ("drm/msm/dsi: Don't set a load before disabling a > regulator") is a patch a sent the other day verbatim, included in > this series because it's highly related. It could land any > time. > * The next two patches use the new APIs. Since those APIs are now in > mainline those could also land any time. > * The last patch is just cleanup I noticed as I was touching the > function. It's not really related to regulators but it applies atop > these. In theory it could be rebased to land separately. > > Changes in v3: > - ("Improve dsi_phy_driver_probe() probe error handling") new for v3. > - Do all the PHYs too. > - Fix typo in commit message. > - Get rid of error print after devm_regulator_bulk_get_const(). > - Just directly call the bulk commands; get rid of the wrapper. > - Update commit message to point at the git hash of the regulator change. > > Changes in v2: > - ("Fix number of regulators for SDM660") new for v2. > - ("Fix number of regulators for msm8996_dsi_cfg") new for v2. > - ("Take advantage of devm_regulator_bulk_get_const") new for v2. > - ("Use the new regulator bulk feature to specify the load") new for v2. > > Douglas Anderson (6): > drm/msm/dsi: Fix number of regulators for msm8996_dsi_cfg > drm/msm/dsi: Fix number of regulators for SDM660 These two can be picked into the -fixes branch. The reset looks like 5.21/6.1 material > drm/msm/dsi: Don't set a load before disabling a regulator > drm/msm/dsi: Use the new regulator bulk feature to specify the load > drm/msm/dsi: Take advantage of devm_regulator_bulk_get_const() > drm/msm/dsi: Improve dsi_phy_driver_probe() probe error handling > > drivers/gpu/drm/msm/dsi/dsi.h | 13 -- > drivers/gpu/drm/msm/dsi/dsi_cfg.c | 172 +++++++++--------- > drivers/gpu/drm/msm/dsi/dsi_cfg.h | 3 +- > drivers/gpu/drm/msm/dsi/dsi_host.c | 96 ++-------- > drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 160 ++++------------ > drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 5 +- > drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c | 20 +- > drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 32 ++-- > drivers/gpu/drm/msm/dsi/phy/dsi_phy_20nm.c | 14 +- > drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c | 28 +-- > .../gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c | 12 +- > drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c | 32 ++-- > 12 files changed, 197 insertions(+), 390 deletions(-) >
Hi, On Wed, Aug 3, 2022 at 12:19 AM Dmitry Baryshkov <dmitry.baryshkov@linaro.org> wrote: > > On 03/08/2022 01:37, Douglas Anderson wrote: > > As of the commit 1de452a0edda ("regulator: core: Allow drivers to > > define their init data as const") we no longer need to do copying of > > regulator bulk data from initdata to something dynamic. Let's take > > advantage of that. > > > > In addition to saving some code, this also moves us to using > > ARRAY_SIZE() to specify how many regulators we have which is less > > error prone. > > > > This gets rid of some layers of wrappers which makes it obvious that > > we can get rid of an extra error print. > > devm_regulator_bulk_get_const() prints errors for you so you don't > > need an extra layer of printing. > > > > In all cases here I have preserved the old settings without any > > investigation about whether the loads being set are sensible. In the > > cases of some of the PHYs if several PHYs in the same file used > > exactly the same settings I had them point to the same data structure. > > > > NOTE: Though I haven't done the math, this is likely an overall > > savings in terms of "static const" data. We previously always > > allocated space for 8 supplies. Each of these supplies took up 36 > > bytes of data (32 for name, 4 for an int). > > > > Signed-off-by: Douglas Anderson <dianders@chromium.org> > > Ah, so to array conversion is already done. That's great. > > Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > > > > --- > > > > Changes in v3: > > - Do all the PHYs too. > > It would have been easier if DSI and DSI PHY were split to separate patches. One of the earlier patches in the series (where we remove the "disable" load) was harder to split since the DSI and DSI PHY code was sharing a single data structure. Once I had one patch touching both at the same time I figured I'd keep them all like that. If you need me to rework them to be separate patches to make it easier to land then please yell. Otherwise I'll assume it's OK. -Doug
On 8/2/2022 3:37 PM, Douglas Anderson wrote: > 3 regulators are specified listed but the number 2 is specified. Fix > it. > > Fixes: 3a3ff88a0fc1 ("drm/msm/dsi: Add 8x96 info in dsi_cfg") > Signed-off-by: Douglas Anderson <dianders@chromium.org> Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com> Will queue this for -fixes. > --- > > (no changes since v2) > > Changes in v2: > - ("Fix number of regulators for msm8996_dsi_cfg") new for v2. > > drivers/gpu/drm/msm/dsi/dsi_cfg.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/msm/dsi/dsi_cfg.c b/drivers/gpu/drm/msm/dsi/dsi_cfg.c > index 2c23324a2296..02000a7b7a18 100644 > --- a/drivers/gpu/drm/msm/dsi/dsi_cfg.c > +++ b/drivers/gpu/drm/msm/dsi/dsi_cfg.c > @@ -109,7 +109,7 @@ static const char * const dsi_8996_bus_clk_names[] = { > static const struct msm_dsi_config msm8996_dsi_cfg = { > .io_offset = DSI_6G_REG_SHIFT, > .reg_cfg = { > - .num = 2, > + .num = 3, > .regs = { > {"vdda", 18160, 1 }, /* 1.25 V */ > {"vcca", 17000, 32 }, /* 0.925 V */
On 8/2/2022 3:37 PM, Douglas Anderson wrote: > As of commit 5451781dadf8 ("regulator: core: Only count load for > enabled consumers"), a load isn't counted for a disabled > regulator. That means all the code in the DSI driver to specify and > set loads before disabling a regulator is not actually doing anything > useful. Let's remove it. > > It should be noted that all of the loads set that were being specified > were pointless noise anyway. The only use for this number is to pick > between low power and high power modes of regulators. Regulators > appear to do this changeover at loads on the order of 10000 uA. You > would need a lot of clients of the same rail for that 100 uA number to > count for anything. > > Note that now that we get rid of the setting of the load at disable > time, we can just set the load once when we first get the regulator > and then forget it. > > It should also be noted that the regulator functions > regulator_bulk_enable() and regulator_set_load() already print error > messages when they encounter problems so while moving things around we > get rid of some extra error prints. > > Signed-off-by: Douglas Anderson <dianders@chromium.org> Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com> > --- > > Changes in v3: > - Fix typo in commit message. > - Just directly call the bulk commands; get rid of the wrapper. > > drivers/gpu/drm/msm/dsi/dsi.h | 1 - > drivers/gpu/drm/msm/dsi/dsi_cfg.c | 52 +++++++------- > drivers/gpu/drm/msm/dsi/dsi_host.c | 71 ++++--------------- > drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 52 ++------------ > drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c | 4 +- > drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 6 +- > drivers/gpu/drm/msm/dsi/phy/dsi_phy_20nm.c | 4 +- > drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c | 6 +- > .../gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c | 2 +- > drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c | 6 +- > 10 files changed, 60 insertions(+), 144 deletions(-) > > diff --git a/drivers/gpu/drm/msm/dsi/dsi.h b/drivers/gpu/drm/msm/dsi/dsi.h > index 580a1e6358bf..bb6a5bd05cb1 100644 > --- a/drivers/gpu/drm/msm/dsi/dsi.h > +++ b/drivers/gpu/drm/msm/dsi/dsi.h > @@ -37,7 +37,6 @@ enum msm_dsi_phy_usecase { > struct dsi_reg_entry { > char name[32]; > int enable_load; > - int disable_load; > }; > > struct dsi_reg_config { > diff --git a/drivers/gpu/drm/msm/dsi/dsi_cfg.c b/drivers/gpu/drm/msm/dsi/dsi_cfg.c > index 72c018e26f47..901d6fd53800 100644 > --- a/drivers/gpu/drm/msm/dsi/dsi_cfg.c > +++ b/drivers/gpu/drm/msm/dsi/dsi_cfg.c > @@ -14,9 +14,9 @@ static const struct msm_dsi_config apq8064_dsi_cfg = { > .reg_cfg = { > .num = 3, > .regs = { > - {"vdda", 100000, 100}, /* 1.2 V */ > - {"avdd", 10000, 100}, /* 3.0 V */ > - {"vddio", 100000, 100}, /* 1.8 V */ > + {"vdda", 100000}, /* 1.2 V */ > + {"avdd", 10000}, /* 3.0 V */ > + {"vddio", 100000}, /* 1.8 V */ > }, > }, > .bus_clk_names = dsi_v2_bus_clk_names, > @@ -34,9 +34,9 @@ static const struct msm_dsi_config msm8974_apq8084_dsi_cfg = { > .reg_cfg = { > .num = 3, > .regs = { > - {"vdd", 150000, 100}, /* 3.0 V */ > - {"vdda", 100000, 100}, /* 1.2 V */ > - {"vddio", 100000, 100}, /* 1.8 V */ > + {"vdd", 150000}, /* 3.0 V */ > + {"vdda", 100000}, /* 1.2 V */ > + {"vddio", 100000}, /* 1.8 V */ > }, > }, > .bus_clk_names = dsi_6g_bus_clk_names, > @@ -54,8 +54,8 @@ static const struct msm_dsi_config msm8916_dsi_cfg = { > .reg_cfg = { > .num = 2, > .regs = { > - {"vdda", 100000, 100}, /* 1.2 V */ > - {"vddio", 100000, 100}, /* 1.8 V */ > + {"vdda", 100000}, /* 1.2 V */ > + {"vddio", 100000}, /* 1.8 V */ > }, > }, > .bus_clk_names = dsi_8916_bus_clk_names, > @@ -73,8 +73,8 @@ static const struct msm_dsi_config msm8976_dsi_cfg = { > .reg_cfg = { > .num = 2, > .regs = { > - {"vdda", 100000, 100}, /* 1.2 V */ > - {"vddio", 100000, 100}, /* 1.8 V */ > + {"vdda", 100000}, /* 1.2 V */ > + {"vddio", 100000}, /* 1.8 V */ > }, > }, > .bus_clk_names = dsi_8976_bus_clk_names, > @@ -88,12 +88,12 @@ static const struct msm_dsi_config msm8994_dsi_cfg = { > .reg_cfg = { > .num = 6, > .regs = { > - {"vdda", 100000, 100}, /* 1.25 V */ > - {"vddio", 100000, 100}, /* 1.8 V */ > - {"vcca", 10000, 100}, /* 1.0 V */ > - {"vdd", 100000, 100}, /* 1.8 V */ > - {"lab_reg", -1, -1}, > - {"ibb_reg", -1, -1}, > + {"vdda", 100000}, /* 1.25 V */ > + {"vddio", 100000}, /* 1.8 V */ > + {"vcca", 10000}, /* 1.0 V */ > + {"vdd", 100000}, /* 1.8 V */ > + {"lab_reg", -1}, > + {"ibb_reg", -1}, > }, > }, > .bus_clk_names = dsi_6g_bus_clk_names, > @@ -111,9 +111,9 @@ static const struct msm_dsi_config msm8996_dsi_cfg = { > .reg_cfg = { > .num = 3, > .regs = { > - {"vdda", 18160, 1 }, /* 1.25 V */ > - {"vcca", 17000, 32 }, /* 0.925 V */ > - {"vddio", 100000, 100 },/* 1.8 V */ > + {"vdda", 18160}, /* 1.25 V */ > + {"vcca", 17000}, /* 0.925 V */ > + {"vddio", 100000},/* 1.8 V */ > }, > }, > .bus_clk_names = dsi_8996_bus_clk_names, > @@ -131,8 +131,8 @@ static const struct msm_dsi_config msm8998_dsi_cfg = { > .reg_cfg = { > .num = 2, > .regs = { > - {"vdd", 367000, 16 }, /* 0.9 V */ > - {"vdda", 62800, 2 }, /* 1.2 V */ > + {"vdd", 367000}, /* 0.9 V */ > + {"vdda", 62800}, /* 1.2 V */ > }, > }, > .bus_clk_names = dsi_msm8998_bus_clk_names, > @@ -150,7 +150,7 @@ static const struct msm_dsi_config sdm660_dsi_cfg = { > .reg_cfg = { > .num = 1, > .regs = { > - {"vdda", 12560, 4 }, /* 1.2 V */ > + {"vdda", 12560}, /* 1.2 V */ > }, > }, > .bus_clk_names = dsi_sdm660_bus_clk_names, > @@ -172,7 +172,7 @@ static const struct msm_dsi_config sdm845_dsi_cfg = { > .reg_cfg = { > .num = 1, > .regs = { > - {"vdda", 21800, 4 }, /* 1.2 V */ > + {"vdda", 21800}, /* 1.2 V */ > }, > }, > .bus_clk_names = dsi_sdm845_bus_clk_names, > @@ -186,7 +186,7 @@ static const struct msm_dsi_config sc7180_dsi_cfg = { > .reg_cfg = { > .num = 1, > .regs = { > - {"vdda", 21800, 4 }, /* 1.2 V */ > + {"vdda", 21800}, /* 1.2 V */ > }, > }, > .bus_clk_names = dsi_sc7180_bus_clk_names, > @@ -204,7 +204,7 @@ static const struct msm_dsi_config sc7280_dsi_cfg = { > .reg_cfg = { > .num = 1, > .regs = { > - {"vdda", 8350, 0 }, /* 1.2 V */ > + {"vdda", 8350}, /* 1.2 V */ > }, > }, > .bus_clk_names = dsi_sc7280_bus_clk_names, > @@ -222,7 +222,7 @@ static const struct msm_dsi_config qcm2290_dsi_cfg = { > .reg_cfg = { > .num = 1, > .regs = { > - {"vdda", 21800, 4 }, /* 1.2 V */ > + {"vdda", 21800}, /* 1.2 V */ > }, > }, > .bus_clk_names = dsi_qcm2290_bus_clk_names, > diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c > index a95d5df52653..9df278d39559 100644 > --- a/drivers/gpu/drm/msm/dsi/dsi_host.c > +++ b/drivers/gpu/drm/msm/dsi/dsi_host.c > @@ -203,9 +203,6 @@ static inline void dsi_write(struct msm_dsi_host *msm_host, u32 reg, u32 data) > msm_writel(data, msm_host->ctrl_base + reg); > } > > -static int dsi_host_regulator_enable(struct msm_dsi_host *msm_host); > -static void dsi_host_regulator_disable(struct msm_dsi_host *msm_host); > - > static const struct msm_dsi_cfg_handler *dsi_get_config( > struct msm_dsi_host *msm_host) > { > @@ -256,56 +253,6 @@ static inline struct msm_dsi_host *to_msm_dsi_host(struct mipi_dsi_host *host) > return container_of(host, struct msm_dsi_host, base); > } > > -static void dsi_host_regulator_disable(struct msm_dsi_host *msm_host) > -{ > - struct regulator_bulk_data *s = msm_host->supplies; > - const struct dsi_reg_entry *regs = msm_host->cfg_hnd->cfg->reg_cfg.regs; > - int num = msm_host->cfg_hnd->cfg->reg_cfg.num; > - int i; > - > - DBG(""); > - for (i = num - 1; i >= 0; i--) > - if (regs[i].disable_load >= 0) > - regulator_set_load(s[i].consumer, > - regs[i].disable_load); > - > - regulator_bulk_disable(num, s); > -} > - > -static int dsi_host_regulator_enable(struct msm_dsi_host *msm_host) > -{ > - struct regulator_bulk_data *s = msm_host->supplies; > - const struct dsi_reg_entry *regs = msm_host->cfg_hnd->cfg->reg_cfg.regs; > - int num = msm_host->cfg_hnd->cfg->reg_cfg.num; > - int ret, i; > - > - DBG(""); > - for (i = 0; i < num; i++) { > - if (regs[i].enable_load >= 0) { > - ret = regulator_set_load(s[i].consumer, > - regs[i].enable_load); > - if (ret < 0) { > - pr_err("regulator %d set op mode failed, %d\n", > - i, ret); > - goto fail; > - } > - } > - } > - > - ret = regulator_bulk_enable(num, s); > - if (ret < 0) { > - pr_err("regulator enable failed, %d\n", ret); > - goto fail; > - } > - > - return 0; > - > -fail: > - for (i--; i >= 0; i--) > - regulator_set_load(s[i].consumer, regs[i].disable_load); > - return ret; > -} > - > static int dsi_regulator_init(struct msm_dsi_host *msm_host) > { > struct regulator_bulk_data *s = msm_host->supplies; > @@ -323,6 +270,15 @@ static int dsi_regulator_init(struct msm_dsi_host *msm_host) > return ret; > } > > + for (i = 0; i < num; i++) { > + if (regs[i].enable_load >= 0) { > + ret = regulator_set_load(s[i].consumer, > + regs[i].enable_load); > + if (ret < 0) > + return ret; > + } > + } > + > return 0; > } > > @@ -2561,7 +2517,8 @@ int msm_dsi_host_power_on(struct mipi_dsi_host *host, > > msm_dsi_sfpb_config(msm_host, true); > > - ret = dsi_host_regulator_enable(msm_host); > + ret = regulator_bulk_enable(msm_host->cfg_hnd->cfg->reg_cfg.num, > + msm_host->supplies); > if (ret) { > pr_err("%s:Failed to enable vregs.ret=%d\n", > __func__, ret); > @@ -2601,7 +2558,8 @@ int msm_dsi_host_power_on(struct mipi_dsi_host *host, > cfg_hnd->ops->link_clk_disable(msm_host); > pm_runtime_put(&msm_host->pdev->dev); > fail_disable_reg: > - dsi_host_regulator_disable(msm_host); > + regulator_bulk_disable(msm_host->cfg_hnd->cfg->reg_cfg.num, > + msm_host->supplies); > unlock_ret: > mutex_unlock(&msm_host->dev_mutex); > return ret; > @@ -2628,7 +2586,8 @@ int msm_dsi_host_power_off(struct mipi_dsi_host *host) > cfg_hnd->ops->link_clk_disable(msm_host); > pm_runtime_put(&msm_host->pdev->dev); > > - dsi_host_regulator_disable(msm_host); > + regulator_bulk_disable(msm_host->cfg_hnd->cfg->reg_cfg.num, > + msm_host->supplies); > > msm_dsi_sfpb_config(msm_host, false); > > diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy.c b/drivers/gpu/drm/msm/dsi/phy/dsi_phy.c > index a39de3bdc7fa..7c105120d73e 100644 > --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy.c > +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy.c > @@ -529,58 +529,16 @@ static int dsi_phy_regulator_init(struct msm_dsi_phy *phy) > return ret; > } > > - return 0; > -} > - > -static void dsi_phy_regulator_disable(struct msm_dsi_phy *phy) > -{ > - struct regulator_bulk_data *s = phy->supplies; > - const struct dsi_reg_entry *regs = phy->cfg->reg_cfg.regs; > - int num = phy->cfg->reg_cfg.num; > - int i; > - > - DBG(""); > - for (i = num - 1; i >= 0; i--) > - if (regs[i].disable_load >= 0) > - regulator_set_load(s[i].consumer, regs[i].disable_load); > - > - regulator_bulk_disable(num, s); > -} > - > -static int dsi_phy_regulator_enable(struct msm_dsi_phy *phy) > -{ > - struct regulator_bulk_data *s = phy->supplies; > - const struct dsi_reg_entry *regs = phy->cfg->reg_cfg.regs; > - struct device *dev = &phy->pdev->dev; > - int num = phy->cfg->reg_cfg.num; > - int ret, i; > - > - DBG(""); > for (i = 0; i < num; i++) { > if (regs[i].enable_load >= 0) { > ret = regulator_set_load(s[i].consumer, > regs[i].enable_load); > - if (ret < 0) { > - DRM_DEV_ERROR(dev, > - "regulator %d set op mode failed, %d\n", > - i, ret); > - goto fail; > - } > + if (ret < 0) > + return ret; > } > } > > - ret = regulator_bulk_enable(num, s); > - if (ret < 0) { > - DRM_DEV_ERROR(dev, "regulator enable failed, %d\n", ret); > - goto fail; > - } > - > return 0; > - > -fail: > - for (i--; i >= 0; i--) > - regulator_set_load(s[i].consumer, regs[i].disable_load); > - return ret; > } > > static int dsi_phy_enable_resource(struct msm_dsi_phy *phy) > @@ -829,7 +787,7 @@ int msm_dsi_phy_enable(struct msm_dsi_phy *phy, > goto res_en_fail; > } > > - ret = dsi_phy_regulator_enable(phy); > + ret = regulator_bulk_enable(phy->cfg->reg_cfg.num, phy->supplies); > if (ret) { > DRM_DEV_ERROR(dev, "%s: regulator enable failed, %d\n", > __func__, ret); > @@ -866,7 +824,7 @@ int msm_dsi_phy_enable(struct msm_dsi_phy *phy, > if (phy->cfg->ops.disable) > phy->cfg->ops.disable(phy); > phy_en_fail: > - dsi_phy_regulator_disable(phy); > + regulator_bulk_disable(phy->cfg->reg_cfg.num, phy->supplies); > reg_en_fail: > dsi_phy_disable_resource(phy); > res_en_fail: > @@ -880,7 +838,7 @@ void msm_dsi_phy_disable(struct msm_dsi_phy *phy) > > phy->cfg->ops.disable(phy); > > - dsi_phy_regulator_disable(phy); > + regulator_bulk_disable(phy->cfg->reg_cfg.num, phy->supplies); > dsi_phy_disable_resource(phy); > } > > diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c > index 08b015ea1b1e..6a10a1448051 100644 > --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c > +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c > @@ -1033,7 +1033,7 @@ const struct msm_dsi_phy_cfg dsi_phy_10nm_cfgs = { > .reg_cfg = { > .num = 1, > .regs = { > - {"vdds", 36000, 32}, > + {"vdds", 36000}, > }, > }, > .ops = { > @@ -1055,7 +1055,7 @@ const struct msm_dsi_phy_cfg dsi_phy_10nm_8998_cfgs = { > .reg_cfg = { > .num = 1, > .regs = { > - {"vdds", 36000, 32}, > + {"vdds", 36000}, > }, > }, > .ops = { > diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c > index 8199c53567f4..0f3d4c56c333 100644 > --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c > +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c > @@ -1029,7 +1029,7 @@ const struct msm_dsi_phy_cfg dsi_phy_14nm_cfgs = { > .reg_cfg = { > .num = 1, > .regs = { > - {"vcca", 17000, 32}, > + {"vcca", 17000}, > }, > }, > .ops = { > @@ -1050,7 +1050,7 @@ const struct msm_dsi_phy_cfg dsi_phy_14nm_660_cfgs = { > .reg_cfg = { > .num = 1, > .regs = { > - {"vcca", 73400, 32}, > + {"vcca", 73400}, > }, > }, > .ops = { > @@ -1071,7 +1071,7 @@ const struct msm_dsi_phy_cfg dsi_phy_14nm_8953_cfgs = { > .reg_cfg = { > .num = 1, > .regs = { > - {"vcca", 17000, 32}, > + {"vcca", 17000}, > }, > }, > .ops = { > diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_20nm.c b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_20nm.c > index ee7c418a1c29..b7c621d94981 100644 > --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_20nm.c > +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_20nm.c > @@ -134,8 +134,8 @@ const struct msm_dsi_phy_cfg dsi_phy_20nm_cfgs = { > .reg_cfg = { > .num = 2, > .regs = { > - {"vddio", 100000, 100}, /* 1.8 V */ > - {"vcca", 10000, 100}, /* 1.0 V */ > + {"vddio", 100000}, /* 1.8 V */ > + {"vcca", 10000}, /* 1.0 V */ > }, > }, > .ops = { > diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c > index 48eab80b548e..6beba387640d 100644 > --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c > +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c > @@ -774,7 +774,7 @@ const struct msm_dsi_phy_cfg dsi_phy_28nm_hpm_cfgs = { > .reg_cfg = { > .num = 1, > .regs = { > - {"vddio", 100000, 100}, > + {"vddio", 100000}, > }, > }, > .ops = { > @@ -795,7 +795,7 @@ const struct msm_dsi_phy_cfg dsi_phy_28nm_hpm_famb_cfgs = { > .reg_cfg = { > .num = 1, > .regs = { > - {"vddio", 100000, 100}, > + {"vddio", 100000}, > }, > }, > .ops = { > @@ -816,7 +816,7 @@ const struct msm_dsi_phy_cfg dsi_phy_28nm_lp_cfgs = { > .reg_cfg = { > .num = 1, > .regs = { > - {"vddio", 100000, 100}, /* 1.8 V */ > + {"vddio", 100000}, /* 1.8 V */ > }, > }, > .ops = { > diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c > index fc56cdcc9ad6..2e942b10fffa 100644 > --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c > +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c > @@ -653,7 +653,7 @@ const struct msm_dsi_phy_cfg dsi_phy_28nm_8960_cfgs = { > .reg_cfg = { > .num = 1, > .regs = { > - {"vddio", 100000, 100}, /* 1.8 V */ > + {"vddio", 100000}, /* 1.8 V */ > }, > }, > .ops = { > diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c > index 66ed1919a1db..9c7c49ce1200 100644 > --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c > +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c > @@ -1041,7 +1041,7 @@ const struct msm_dsi_phy_cfg dsi_phy_7nm_cfgs = { > .reg_cfg = { > .num = 1, > .regs = { > - {"vdds", 36000, 32}, > + {"vdds", 36000}, > }, > }, > .ops = { > @@ -1068,7 +1068,7 @@ const struct msm_dsi_phy_cfg dsi_phy_7nm_8150_cfgs = { > .reg_cfg = { > .num = 1, > .regs = { > - {"vdds", 36000, 32}, > + {"vdds", 36000}, > }, > }, > .ops = { > @@ -1090,7 +1090,7 @@ const struct msm_dsi_phy_cfg dsi_phy_7nm_7280_cfgs = { > .reg_cfg = { > .num = 1, > .regs = { > - {"vdds", 37550, 0}, > + {"vdds", 37550}, > }, > }, > .ops = {
The main goal of this series is to make a small dent in cleaning up the way we deal with regulator loads for DSI drivers. As of v3 of this series, the regulator API improvements needed for the later patches in the series are merged into mainline. Thus this series only contains the DSI changes now. I'd expect: * The first two patches are bugfixes found while converting the DSI driver over. Those could land any time. * The third patch ("drm/msm/dsi: Don't set a load before disabling a regulator") is a patch a sent the other day verbatim, included in this series because it's highly related. It could land any time. * The next two patches use the new APIs. Since those APIs are now in mainline those could also land any time. * The last patch is just cleanup I noticed as I was touching the function. It's not really related to regulators but it applies atop these. In theory it could be rebased to land separately. Changes in v3: - ("Improve dsi_phy_driver_probe() probe error handling") new for v3. - Do all the PHYs too. - Fix typo in commit message. - Get rid of error print after devm_regulator_bulk_get_const(). - Just directly call the bulk commands; get rid of the wrapper. - Update commit message to point at the git hash of the regulator change. Changes in v2: - ("Fix number of regulators for SDM660") new for v2. - ("Fix number of regulators for msm8996_dsi_cfg") new for v2. - ("Take advantage of devm_regulator_bulk_get_const") new for v2. - ("Use the new regulator bulk feature to specify the load") new for v2. Douglas Anderson (6): drm/msm/dsi: Fix number of regulators for msm8996_dsi_cfg drm/msm/dsi: Fix number of regulators for SDM660 drm/msm/dsi: Don't set a load before disabling a regulator drm/msm/dsi: Use the new regulator bulk feature to specify the load drm/msm/dsi: Take advantage of devm_regulator_bulk_get_const() drm/msm/dsi: Improve dsi_phy_driver_probe() probe error handling drivers/gpu/drm/msm/dsi/dsi.h | 13 -- drivers/gpu/drm/msm/dsi/dsi_cfg.c | 172 +++++++++--------- drivers/gpu/drm/msm/dsi/dsi_cfg.h | 3 +- drivers/gpu/drm/msm/dsi/dsi_host.c | 96 ++-------- drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 160 ++++------------ drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 5 +- drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c | 20 +- drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 32 ++-- drivers/gpu/drm/msm/dsi/phy/dsi_phy_20nm.c | 14 +- drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c | 28 +-- .../gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c | 12 +- drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c | 32 ++-- 12 files changed, 197 insertions(+), 390 deletions(-)