| Message ID | 20210331105735.3690009-25-dmitry.baryshkov@linaro.org |
|---|---|
| State | Accepted |
| Commit | 36c5dde5fdf028daf005197a4dd08b196784bf9e |
| Headers | show |
| Series | drm/msm/dsi: refactor MSM DSI PHY/PLL drivers | expand |
On 2021-03-31 03:57, Dmitry Baryshkov wrote: > Phy driver already knows the source PLL id basing on the set usecase > and > the current PLL id. Stop passing it to the phy_enable call. As a > reminder, dsi manager will always use DSI 0 as a clock master in a > slave > mode, so PLL 0 is always a clocksource for DSI 0 and it is always a > clocksource for DSI 1 too unless DSI 1 is used in the standalone mode. > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > Tested-by: Stephen Boyd <swboyd@chromium.org> # on sc7180 lazor Reviewed-by: Abhinav Kumar <abhinavk@codeaurora.org> > --- > drivers/gpu/drm/msm/dsi/dsi.h | 2 +- > drivers/gpu/drm/msm/dsi/dsi_manager.c | 11 +++++------ > drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 4 ++-- > drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 2 +- > drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c | 2 +- > drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 4 ++-- > drivers/gpu/drm/msm/dsi/phy/dsi_phy_20nm.c | 4 ++-- > drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c | 4 ++-- > drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c | 2 +- > drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c | 2 +- > 10 files changed, 18 insertions(+), 19 deletions(-) > > diff --git a/drivers/gpu/drm/msm/dsi/dsi.h > b/drivers/gpu/drm/msm/dsi/dsi.h > index 7f99e12efd52..7abfeab08165 100644 > --- a/drivers/gpu/drm/msm/dsi/dsi.h > +++ b/drivers/gpu/drm/msm/dsi/dsi.h > @@ -162,7 +162,7 @@ struct msm_dsi_phy_clk_request { > > void msm_dsi_phy_driver_register(void); > void msm_dsi_phy_driver_unregister(void); > -int msm_dsi_phy_enable(struct msm_dsi_phy *phy, int src_pll_id, > +int msm_dsi_phy_enable(struct msm_dsi_phy *phy, > struct msm_dsi_phy_clk_request *clk_req); > void msm_dsi_phy_disable(struct msm_dsi_phy *phy); > void msm_dsi_phy_get_shared_timings(struct msm_dsi_phy *phy, > diff --git a/drivers/gpu/drm/msm/dsi/dsi_manager.c > b/drivers/gpu/drm/msm/dsi/dsi_manager.c > index e116e5ff5d24..cd016576e8c5 100644 > --- a/drivers/gpu/drm/msm/dsi/dsi_manager.c > +++ b/drivers/gpu/drm/msm/dsi/dsi_manager.c > @@ -114,7 +114,7 @@ static int dsi_mgr_setup_components(int id) > return ret; > } > > -static int enable_phy(struct msm_dsi *msm_dsi, int src_pll_id, > +static int enable_phy(struct msm_dsi *msm_dsi, > struct msm_dsi_phy_shared_timings *shared_timings) > { > struct msm_dsi_phy_clk_request clk_req; > @@ -123,7 +123,7 @@ static int enable_phy(struct msm_dsi *msm_dsi, int > src_pll_id, > > msm_dsi_host_get_phy_clk_req(msm_dsi->host, &clk_req, is_dual_dsi); > > - ret = msm_dsi_phy_enable(msm_dsi->phy, src_pll_id, &clk_req); > + ret = msm_dsi_phy_enable(msm_dsi->phy, &clk_req); > msm_dsi_phy_get_shared_timings(msm_dsi->phy, shared_timings); > > return ret; > @@ -136,7 +136,6 @@ dsi_mgr_phy_enable(int id, > struct msm_dsi *msm_dsi = dsi_mgr_get_dsi(id); > struct msm_dsi *mdsi = dsi_mgr_get_dsi(DSI_CLOCK_MASTER); > struct msm_dsi *sdsi = dsi_mgr_get_dsi(DSI_CLOCK_SLAVE); > - int src_pll_id = IS_DUAL_DSI() ? DSI_CLOCK_MASTER : id; > int ret; > > /* In case of dual DSI, some registers in PHY1 have been programmed > @@ -149,11 +148,11 @@ dsi_mgr_phy_enable(int id, > msm_dsi_host_reset_phy(mdsi->host); > msm_dsi_host_reset_phy(sdsi->host); > > - ret = enable_phy(mdsi, src_pll_id, > + ret = enable_phy(mdsi, > &shared_timings[DSI_CLOCK_MASTER]); > if (ret) > return ret; > - ret = enable_phy(sdsi, src_pll_id, > + ret = enable_phy(sdsi, > &shared_timings[DSI_CLOCK_SLAVE]); > if (ret) { > msm_dsi_phy_disable(mdsi->phy); > @@ -162,7 +161,7 @@ dsi_mgr_phy_enable(int id, > } > } else { > msm_dsi_host_reset_phy(msm_dsi->host); > - ret = enable_phy(msm_dsi, src_pll_id, &shared_timings[id]); > + ret = enable_phy(msm_dsi, &shared_timings[id]); > if (ret) > return ret; > } > diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy.c > b/drivers/gpu/drm/msm/dsi/phy/dsi_phy.c > index 93e81bb78d26..f0a2ddf96a4b 100644 > --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy.c > +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy.c > @@ -753,7 +753,7 @@ void __exit msm_dsi_phy_driver_unregister(void) > platform_driver_unregister(&dsi_phy_platform_driver); > } > > -int msm_dsi_phy_enable(struct msm_dsi_phy *phy, int src_pll_id, > +int msm_dsi_phy_enable(struct msm_dsi_phy *phy, > struct msm_dsi_phy_clk_request *clk_req) > { > struct device *dev = &phy->pdev->dev; > @@ -776,7 +776,7 @@ int msm_dsi_phy_enable(struct msm_dsi_phy *phy, > int src_pll_id, > goto reg_en_fail; > } > > - ret = phy->cfg->ops.enable(phy, src_pll_id, clk_req); > + ret = phy->cfg->ops.enable(phy, clk_req); > if (ret) { > DRM_DEV_ERROR(dev, "%s: phy enable failed, %d\n", __func__, ret); > goto phy_en_fail; > diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy.h > b/drivers/gpu/drm/msm/dsi/phy/dsi_phy.h > index 00ef01baaebd..94a77ac364d3 100644 > --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy.h > +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy.h > @@ -19,7 +19,7 @@ > > struct msm_dsi_phy_ops { > int (*pll_init)(struct msm_dsi_phy *phy); > - int (*enable)(struct msm_dsi_phy *phy, int src_pll_id, > + int (*enable)(struct msm_dsi_phy *phy, > struct msm_dsi_phy_clk_request *clk_req); > void (*disable)(struct msm_dsi_phy *phy); > void (*save_pll_state)(struct msm_dsi_phy *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 64b8b0efc1a4..34bc93548fcf 100644 > --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c > +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c > @@ -788,7 +788,7 @@ static void dsi_phy_hw_v3_0_lane_settings(struct > msm_dsi_phy *phy) > } > } > > -static int dsi_10nm_phy_enable(struct msm_dsi_phy *phy, int > src_pll_id, > +static int dsi_10nm_phy_enable(struct msm_dsi_phy *phy, > struct msm_dsi_phy_clk_request *clk_req) > { > int ret; > 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 9a2937589435..65d68eb9e3cb 100644 > --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c > +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c > @@ -938,7 +938,7 @@ static void dsi_14nm_dphy_set_timing(struct > msm_dsi_phy *phy, > DSI_14nm_PHY_LN_TIMING_CTRL_11_TRIG3_CMD(0xa0)); > } > > -static int dsi_14nm_phy_enable(struct msm_dsi_phy *phy, int > src_pll_id, > +static int dsi_14nm_phy_enable(struct msm_dsi_phy *phy, > struct msm_dsi_phy_clk_request *clk_req) > { > struct msm_dsi_dphy_timing *timing = &phy->timing; > @@ -996,7 +996,7 @@ static int dsi_14nm_phy_enable(struct msm_dsi_phy > *phy, int src_pll_id, > dsi_phy_write(base + REG_DSI_14nm_PHY_CMN_CTRL_1, 0x00); > > glbl_test_ctrl = dsi_phy_read(base + > REG_DSI_14nm_PHY_CMN_GLBL_TEST_CTRL); > - if (phy->id == DSI_1 && src_pll_id == DSI_0) > + if (phy->id == DSI_1 && phy->usecase == MSM_DSI_PHY_SLAVE) > glbl_test_ctrl |= DSI_14nm_PHY_CMN_GLBL_TEST_CTRL_BITCLK_HS_SEL; > else > glbl_test_ctrl &= ~DSI_14nm_PHY_CMN_GLBL_TEST_CTRL_BITCLK_HS_SEL; > 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 f5b88c85a8fc..e96d789aea18 100644 > --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_20nm.c > +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_20nm.c > @@ -63,7 +63,7 @@ static void dsi_20nm_phy_regulator_ctrl(struct > msm_dsi_phy *phy, bool enable) > dsi_phy_write(base + REG_DSI_20nm_PHY_REGULATOR_CTRL_0, 0x03); > } > > -static int dsi_20nm_phy_enable(struct msm_dsi_phy *phy, int > src_pll_id, > +static int dsi_20nm_phy_enable(struct msm_dsi_phy *phy, > struct msm_dsi_phy_clk_request *clk_req) > { > struct msm_dsi_dphy_timing *timing = &phy->timing; > @@ -85,7 +85,7 @@ static int dsi_20nm_phy_enable(struct msm_dsi_phy > *phy, int src_pll_id, > dsi_phy_write(base + REG_DSI_20nm_PHY_STRENGTH_0, 0xff); > > val = dsi_phy_read(base + REG_DSI_20nm_PHY_GLBL_TEST_CTRL); > - if (src_pll_id == DSI_1) > + if (phy->id == DSI_1 && phy->usecase == MSM_DSI_PHY_STANDALONE) > val |= DSI_20nm_PHY_GLBL_TEST_CTRL_BITCLK_HS_SEL; > else > val &= ~DSI_20nm_PHY_GLBL_TEST_CTRL_BITCLK_HS_SEL; > 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 61f2f7f672ca..3304acda2165 100644 > --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c > +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c > @@ -698,7 +698,7 @@ static void dsi_28nm_phy_regulator_ctrl(struct > msm_dsi_phy *phy, bool enable) > dsi_28nm_phy_regulator_enable_dcdc(phy); > } > > -static int dsi_28nm_phy_enable(struct msm_dsi_phy *phy, int > src_pll_id, > +static int dsi_28nm_phy_enable(struct msm_dsi_phy *phy, > struct msm_dsi_phy_clk_request *clk_req) > { > struct msm_dsi_dphy_timing *timing = &phy->timing; > @@ -745,7 +745,7 @@ static int dsi_28nm_phy_enable(struct msm_dsi_phy > *phy, int src_pll_id, > dsi_phy_write(base + REG_DSI_28nm_PHY_CTRL_0, 0x5f); > > val = dsi_phy_read(base + REG_DSI_28nm_PHY_GLBL_TEST_CTRL); > - if (phy->id == DSI_1 && src_pll_id == DSI_0) > + if (phy->id == DSI_1 && phy->usecase == MSM_DSI_PHY_SLAVE) > val &= ~DSI_28nm_PHY_GLBL_TEST_CTRL_BITCLK_HS_SEL; > else > val |= DSI_28nm_PHY_GLBL_TEST_CTRL_BITCLK_HS_SEL; > 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 83e275ed7476..582b1428f971 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 > @@ -585,7 +585,7 @@ static void dsi_28nm_phy_lane_config(struct > msm_dsi_phy *phy) > dsi_phy_write(base + REG_DSI_28nm_8960_PHY_LNCK_TEST_STR1, 0x88); > } > > -static int dsi_28nm_phy_enable(struct msm_dsi_phy *phy, int > src_pll_id, > +static int dsi_28nm_phy_enable(struct msm_dsi_phy *phy, > struct msm_dsi_phy_clk_request *clk_req) > { > struct msm_dsi_dphy_timing *timing = &phy->timing; > 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 dc28dd37c7f9..e76ce40a12ab 100644 > --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c > +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c > @@ -801,7 +801,7 @@ static void dsi_phy_hw_v4_0_lane_settings(struct > msm_dsi_phy *phy) > } > } > > -static int dsi_7nm_phy_enable(struct msm_dsi_phy *phy, int src_pll_id, > +static int dsi_7nm_phy_enable(struct msm_dsi_phy *phy, > struct msm_dsi_phy_clk_request *clk_req) > { > int ret; _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/msm/dsi/dsi.h b/drivers/gpu/drm/msm/dsi/dsi.h index 7f99e12efd52..7abfeab08165 100644 --- a/drivers/gpu/drm/msm/dsi/dsi.h +++ b/drivers/gpu/drm/msm/dsi/dsi.h @@ -162,7 +162,7 @@ struct msm_dsi_phy_clk_request { void msm_dsi_phy_driver_register(void); void msm_dsi_phy_driver_unregister(void); -int msm_dsi_phy_enable(struct msm_dsi_phy *phy, int src_pll_id, +int msm_dsi_phy_enable(struct msm_dsi_phy *phy, struct msm_dsi_phy_clk_request *clk_req); void msm_dsi_phy_disable(struct msm_dsi_phy *phy); void msm_dsi_phy_get_shared_timings(struct msm_dsi_phy *phy, diff --git a/drivers/gpu/drm/msm/dsi/dsi_manager.c b/drivers/gpu/drm/msm/dsi/dsi_manager.c index e116e5ff5d24..cd016576e8c5 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_manager.c +++ b/drivers/gpu/drm/msm/dsi/dsi_manager.c @@ -114,7 +114,7 @@ static int dsi_mgr_setup_components(int id) return ret; } -static int enable_phy(struct msm_dsi *msm_dsi, int src_pll_id, +static int enable_phy(struct msm_dsi *msm_dsi, struct msm_dsi_phy_shared_timings *shared_timings) { struct msm_dsi_phy_clk_request clk_req; @@ -123,7 +123,7 @@ static int enable_phy(struct msm_dsi *msm_dsi, int src_pll_id, msm_dsi_host_get_phy_clk_req(msm_dsi->host, &clk_req, is_dual_dsi); - ret = msm_dsi_phy_enable(msm_dsi->phy, src_pll_id, &clk_req); + ret = msm_dsi_phy_enable(msm_dsi->phy, &clk_req); msm_dsi_phy_get_shared_timings(msm_dsi->phy, shared_timings); return ret; @@ -136,7 +136,6 @@ dsi_mgr_phy_enable(int id, struct msm_dsi *msm_dsi = dsi_mgr_get_dsi(id); struct msm_dsi *mdsi = dsi_mgr_get_dsi(DSI_CLOCK_MASTER); struct msm_dsi *sdsi = dsi_mgr_get_dsi(DSI_CLOCK_SLAVE); - int src_pll_id = IS_DUAL_DSI() ? DSI_CLOCK_MASTER : id; int ret; /* In case of dual DSI, some registers in PHY1 have been programmed @@ -149,11 +148,11 @@ dsi_mgr_phy_enable(int id, msm_dsi_host_reset_phy(mdsi->host); msm_dsi_host_reset_phy(sdsi->host); - ret = enable_phy(mdsi, src_pll_id, + ret = enable_phy(mdsi, &shared_timings[DSI_CLOCK_MASTER]); if (ret) return ret; - ret = enable_phy(sdsi, src_pll_id, + ret = enable_phy(sdsi, &shared_timings[DSI_CLOCK_SLAVE]); if (ret) { msm_dsi_phy_disable(mdsi->phy); @@ -162,7 +161,7 @@ dsi_mgr_phy_enable(int id, } } else { msm_dsi_host_reset_phy(msm_dsi->host); - ret = enable_phy(msm_dsi, src_pll_id, &shared_timings[id]); + ret = enable_phy(msm_dsi, &shared_timings[id]); if (ret) return ret; } diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy.c b/drivers/gpu/drm/msm/dsi/phy/dsi_phy.c index 93e81bb78d26..f0a2ddf96a4b 100644 --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy.c +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy.c @@ -753,7 +753,7 @@ void __exit msm_dsi_phy_driver_unregister(void) platform_driver_unregister(&dsi_phy_platform_driver); } -int msm_dsi_phy_enable(struct msm_dsi_phy *phy, int src_pll_id, +int msm_dsi_phy_enable(struct msm_dsi_phy *phy, struct msm_dsi_phy_clk_request *clk_req) { struct device *dev = &phy->pdev->dev; @@ -776,7 +776,7 @@ int msm_dsi_phy_enable(struct msm_dsi_phy *phy, int src_pll_id, goto reg_en_fail; } - ret = phy->cfg->ops.enable(phy, src_pll_id, clk_req); + ret = phy->cfg->ops.enable(phy, clk_req); if (ret) { DRM_DEV_ERROR(dev, "%s: phy enable failed, %d\n", __func__, ret); goto phy_en_fail; diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy.h b/drivers/gpu/drm/msm/dsi/phy/dsi_phy.h index 00ef01baaebd..94a77ac364d3 100644 --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy.h +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy.h @@ -19,7 +19,7 @@ struct msm_dsi_phy_ops { int (*pll_init)(struct msm_dsi_phy *phy); - int (*enable)(struct msm_dsi_phy *phy, int src_pll_id, + int (*enable)(struct msm_dsi_phy *phy, struct msm_dsi_phy_clk_request *clk_req); void (*disable)(struct msm_dsi_phy *phy); void (*save_pll_state)(struct msm_dsi_phy *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 64b8b0efc1a4..34bc93548fcf 100644 --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c @@ -788,7 +788,7 @@ static void dsi_phy_hw_v3_0_lane_settings(struct msm_dsi_phy *phy) } } -static int dsi_10nm_phy_enable(struct msm_dsi_phy *phy, int src_pll_id, +static int dsi_10nm_phy_enable(struct msm_dsi_phy *phy, struct msm_dsi_phy_clk_request *clk_req) { int ret; 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 9a2937589435..65d68eb9e3cb 100644 --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c @@ -938,7 +938,7 @@ static void dsi_14nm_dphy_set_timing(struct msm_dsi_phy *phy, DSI_14nm_PHY_LN_TIMING_CTRL_11_TRIG3_CMD(0xa0)); } -static int dsi_14nm_phy_enable(struct msm_dsi_phy *phy, int src_pll_id, +static int dsi_14nm_phy_enable(struct msm_dsi_phy *phy, struct msm_dsi_phy_clk_request *clk_req) { struct msm_dsi_dphy_timing *timing = &phy->timing; @@ -996,7 +996,7 @@ static int dsi_14nm_phy_enable(struct msm_dsi_phy *phy, int src_pll_id, dsi_phy_write(base + REG_DSI_14nm_PHY_CMN_CTRL_1, 0x00); glbl_test_ctrl = dsi_phy_read(base + REG_DSI_14nm_PHY_CMN_GLBL_TEST_CTRL); - if (phy->id == DSI_1 && src_pll_id == DSI_0) + if (phy->id == DSI_1 && phy->usecase == MSM_DSI_PHY_SLAVE) glbl_test_ctrl |= DSI_14nm_PHY_CMN_GLBL_TEST_CTRL_BITCLK_HS_SEL; else glbl_test_ctrl &= ~DSI_14nm_PHY_CMN_GLBL_TEST_CTRL_BITCLK_HS_SEL; 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 f5b88c85a8fc..e96d789aea18 100644 --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_20nm.c +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_20nm.c @@ -63,7 +63,7 @@ static void dsi_20nm_phy_regulator_ctrl(struct msm_dsi_phy *phy, bool enable) dsi_phy_write(base + REG_DSI_20nm_PHY_REGULATOR_CTRL_0, 0x03); } -static int dsi_20nm_phy_enable(struct msm_dsi_phy *phy, int src_pll_id, +static int dsi_20nm_phy_enable(struct msm_dsi_phy *phy, struct msm_dsi_phy_clk_request *clk_req) { struct msm_dsi_dphy_timing *timing = &phy->timing; @@ -85,7 +85,7 @@ static int dsi_20nm_phy_enable(struct msm_dsi_phy *phy, int src_pll_id, dsi_phy_write(base + REG_DSI_20nm_PHY_STRENGTH_0, 0xff); val = dsi_phy_read(base + REG_DSI_20nm_PHY_GLBL_TEST_CTRL); - if (src_pll_id == DSI_1) + if (phy->id == DSI_1 && phy->usecase == MSM_DSI_PHY_STANDALONE) val |= DSI_20nm_PHY_GLBL_TEST_CTRL_BITCLK_HS_SEL; else val &= ~DSI_20nm_PHY_GLBL_TEST_CTRL_BITCLK_HS_SEL; 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 61f2f7f672ca..3304acda2165 100644 --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c @@ -698,7 +698,7 @@ static void dsi_28nm_phy_regulator_ctrl(struct msm_dsi_phy *phy, bool enable) dsi_28nm_phy_regulator_enable_dcdc(phy); } -static int dsi_28nm_phy_enable(struct msm_dsi_phy *phy, int src_pll_id, +static int dsi_28nm_phy_enable(struct msm_dsi_phy *phy, struct msm_dsi_phy_clk_request *clk_req) { struct msm_dsi_dphy_timing *timing = &phy->timing; @@ -745,7 +745,7 @@ static int dsi_28nm_phy_enable(struct msm_dsi_phy *phy, int src_pll_id, dsi_phy_write(base + REG_DSI_28nm_PHY_CTRL_0, 0x5f); val = dsi_phy_read(base + REG_DSI_28nm_PHY_GLBL_TEST_CTRL); - if (phy->id == DSI_1 && src_pll_id == DSI_0) + if (phy->id == DSI_1 && phy->usecase == MSM_DSI_PHY_SLAVE) val &= ~DSI_28nm_PHY_GLBL_TEST_CTRL_BITCLK_HS_SEL; else val |= DSI_28nm_PHY_GLBL_TEST_CTRL_BITCLK_HS_SEL; 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 83e275ed7476..582b1428f971 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 @@ -585,7 +585,7 @@ static void dsi_28nm_phy_lane_config(struct msm_dsi_phy *phy) dsi_phy_write(base + REG_DSI_28nm_8960_PHY_LNCK_TEST_STR1, 0x88); } -static int dsi_28nm_phy_enable(struct msm_dsi_phy *phy, int src_pll_id, +static int dsi_28nm_phy_enable(struct msm_dsi_phy *phy, struct msm_dsi_phy_clk_request *clk_req) { struct msm_dsi_dphy_timing *timing = &phy->timing; 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 dc28dd37c7f9..e76ce40a12ab 100644 --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c @@ -801,7 +801,7 @@ static void dsi_phy_hw_v4_0_lane_settings(struct msm_dsi_phy *phy) } } -static int dsi_7nm_phy_enable(struct msm_dsi_phy *phy, int src_pll_id, +static int dsi_7nm_phy_enable(struct msm_dsi_phy *phy, struct msm_dsi_phy_clk_request *clk_req) { int ret;