| Message ID | 20230614224402.296825-2-dmitry.baryshkov@linaro.org |
|---|---|
| State | Accepted |
| Commit | 452c46ccf603ab181e7d0866f3137e3ae62b5f49 |
| Headers | show |
| Series | [1/2] drm/msm/dsi: dsi_host: drop unused clocks | expand |
On 2023-06-15 01:44:02, Dmitry Baryshkov wrote: > It makes no sense to pass NULL parameters to dsi_ctrl_config() in the > disable case. Split dsi_ctrl_config() into enable and disable parts and > drop unused params. > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Indeed, it makes much more sense to split this out instead of faking a _configure(false) with a return right at the top and "bogus" pointers. Reviewed-by: Marijn Suijten <marijn.suijten@somainline.org> > --- > drivers/gpu/drm/msm/dsi/dsi_host.c | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c > index eaee621aa6c8..3f6dfb4f9d5a 100644 > --- a/drivers/gpu/drm/msm/dsi/dsi_host.c > +++ b/drivers/gpu/drm/msm/dsi/dsi_host.c > @@ -705,7 +705,12 @@ static inline enum dsi_cmd_dst_format dsi_get_cmd_fmt( > } > } > > -static void dsi_ctrl_config(struct msm_dsi_host *msm_host, bool enable, > +static void dsi_ctrl_disable(struct msm_dsi_host *msm_host) > +{ > + dsi_write(msm_host, REG_DSI_CTRL, 0); > +} > + > +static void dsi_ctrl_enable(struct msm_dsi_host *msm_host, > struct msm_dsi_phy_shared_timings *phy_shared_timings, struct msm_dsi_phy *phy) > { > u32 flags = msm_host->mode_flags; > @@ -713,11 +718,6 @@ static void dsi_ctrl_config(struct msm_dsi_host *msm_host, bool enable, > const struct msm_dsi_cfg_handler *cfg_hnd = msm_host->cfg_hnd; > u32 data = 0, lane_ctrl = 0; > > - if (!enable) { > - dsi_write(msm_host, REG_DSI_CTRL, 0); > - return; > - } > - > if (flags & MIPI_DSI_MODE_VIDEO) { > if (flags & MIPI_DSI_MODE_VIDEO_HSE) > data |= DSI_VID_CFG0_PULSE_MODE_HSA_HE; > @@ -802,7 +802,7 @@ static void dsi_ctrl_config(struct msm_dsi_host *msm_host, bool enable, > if (!(flags & MIPI_DSI_CLOCK_NON_CONTINUOUS)) { > lane_ctrl = dsi_read(msm_host, REG_DSI_LANE_CTRL); > > - if (msm_dsi_phy_set_continuous_clock(phy, enable)) > + if (msm_dsi_phy_set_continuous_clock(phy, true)) > lane_ctrl &= ~DSI_LANE_CTRL_HS_REQ_SEL_PHY; > > dsi_write(msm_host, REG_DSI_LANE_CTRL, > @@ -2358,7 +2358,7 @@ int msm_dsi_host_power_on(struct mipi_dsi_host *host, > > dsi_timing_setup(msm_host, is_bonded_dsi); > dsi_sw_reset(msm_host); > - dsi_ctrl_config(msm_host, true, phy_shared_timings, phy); > + dsi_ctrl_enable(msm_host, phy_shared_timings, phy); > > if (msm_host->disp_en_gpio) > gpiod_set_value(msm_host->disp_en_gpio, 1); > @@ -2390,7 +2390,7 @@ int msm_dsi_host_power_off(struct mipi_dsi_host *host) > goto unlock_ret; > } > > - dsi_ctrl_config(msm_host, false, NULL, NULL); > + dsi_ctrl_disable(msm_host); > > if (msm_host->disp_en_gpio) > gpiod_set_value(msm_host->disp_en_gpio, 0); > -- > 2.39.2 >
diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c index eaee621aa6c8..3f6dfb4f9d5a 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_host.c +++ b/drivers/gpu/drm/msm/dsi/dsi_host.c @@ -705,7 +705,12 @@ static inline enum dsi_cmd_dst_format dsi_get_cmd_fmt( } } -static void dsi_ctrl_config(struct msm_dsi_host *msm_host, bool enable, +static void dsi_ctrl_disable(struct msm_dsi_host *msm_host) +{ + dsi_write(msm_host, REG_DSI_CTRL, 0); +} + +static void dsi_ctrl_enable(struct msm_dsi_host *msm_host, struct msm_dsi_phy_shared_timings *phy_shared_timings, struct msm_dsi_phy *phy) { u32 flags = msm_host->mode_flags; @@ -713,11 +718,6 @@ static void dsi_ctrl_config(struct msm_dsi_host *msm_host, bool enable, const struct msm_dsi_cfg_handler *cfg_hnd = msm_host->cfg_hnd; u32 data = 0, lane_ctrl = 0; - if (!enable) { - dsi_write(msm_host, REG_DSI_CTRL, 0); - return; - } - if (flags & MIPI_DSI_MODE_VIDEO) { if (flags & MIPI_DSI_MODE_VIDEO_HSE) data |= DSI_VID_CFG0_PULSE_MODE_HSA_HE; @@ -802,7 +802,7 @@ static void dsi_ctrl_config(struct msm_dsi_host *msm_host, bool enable, if (!(flags & MIPI_DSI_CLOCK_NON_CONTINUOUS)) { lane_ctrl = dsi_read(msm_host, REG_DSI_LANE_CTRL); - if (msm_dsi_phy_set_continuous_clock(phy, enable)) + if (msm_dsi_phy_set_continuous_clock(phy, true)) lane_ctrl &= ~DSI_LANE_CTRL_HS_REQ_SEL_PHY; dsi_write(msm_host, REG_DSI_LANE_CTRL, @@ -2358,7 +2358,7 @@ int msm_dsi_host_power_on(struct mipi_dsi_host *host, dsi_timing_setup(msm_host, is_bonded_dsi); dsi_sw_reset(msm_host); - dsi_ctrl_config(msm_host, true, phy_shared_timings, phy); + dsi_ctrl_enable(msm_host, phy_shared_timings, phy); if (msm_host->disp_en_gpio) gpiod_set_value(msm_host->disp_en_gpio, 1); @@ -2390,7 +2390,7 @@ int msm_dsi_host_power_off(struct mipi_dsi_host *host) goto unlock_ret; } - dsi_ctrl_config(msm_host, false, NULL, NULL); + dsi_ctrl_disable(msm_host); if (msm_host->disp_en_gpio) gpiod_set_value(msm_host->disp_en_gpio, 0);
It makes no sense to pass NULL parameters to dsi_ctrl_config() in the disable case. Split dsi_ctrl_config() into enable and disable parts and drop unused params. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- drivers/gpu/drm/msm/dsi/dsi_host.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)