[Freedreno] [PATCH v3 24/25] drm/msm/dsi: inline msm_dsi_phy_set_src_pll
abhinavk at codeaurora.org
abhinavk at codeaurora.org
Tue Mar 30 17:44:16 UTC 2021
On 2021-03-30 06:42, Dmitry Baryshkov wrote:
> On 30/03/2021 06:34, abhinavk at codeaurora.org wrote:
>> On 2021-03-27 04:03, Dmitry Baryshkov wrote:
>>> The src_truthtable config is not used for some of phys, which use
>>> other
>>> means of configuring the master/slave usecases. Inline this function
>>> with the goal of removing src_pll_id argument in the next commit.
>>>
>>> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov at linaro.org>
>>> ---
>>> drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 17
>>> -----------------
>>> drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 8 --------
>>> drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c | 2 --
>>> drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 13 +++++++------
>>> drivers/gpu/drm/msm/dsi/phy/dsi_phy_20nm.c | 11 +++++++----
>>> drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c | 13 +++++++------
>>> drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c | 1 -
>>> drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c | 2 --
>>> 8 files changed, 21 insertions(+), 46 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy.c
>>> b/drivers/gpu/drm/msm/dsi/phy/dsi_phy.c
>>> index 74cc11c84d71..56f5134e3933 100644
>>> --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy.c
>>> +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy.c
>>> @@ -461,23 +461,6 @@ int msm_dsi_dphy_timing_calc_v4(struct
>>> msm_dsi_dphy_timing *timing,
>>> return 0;
>>> }
>>>
>>> -void msm_dsi_phy_set_src_pll(struct msm_dsi_phy *phy, int pll_id,
>>> u32 reg,
>>> - u32 bit_mask)
>>> -{
>>> - int phy_id = phy->id;
>>> - u32 val;
>>> -
>>> - if ((phy_id >= DSI_MAX) || (pll_id >= DSI_MAX))
>>> - return;
>>> -
>>> - val = dsi_phy_read(phy->base + reg);
>>> -
>>> - if (phy->cfg->src_pll_truthtable[phy_id][pll_id])
>>> - dsi_phy_write(phy->base + reg, val | bit_mask);
>>> - else
>>> - dsi_phy_write(phy->base + reg, val & (~bit_mask));
>>> -}
>>> -
>>> static int dsi_phy_regulator_init(struct msm_dsi_phy *phy)
>>> {
>>> struct regulator_bulk_data *s = phy->supplies;
>>> diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy.h
>>> b/drivers/gpu/drm/msm/dsi/phy/dsi_phy.h
>>> index 8e828c5ca8f4..3b207cf9f6b4 100644
>>> --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy.h
>>> +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy.h
>>> @@ -33,12 +33,6 @@ struct msm_dsi_phy_cfg {
>>> unsigned long min_pll_rate;
>>> unsigned long max_pll_rate;
>>>
>>> - /*
>>> - * Each cell {phy_id, pll_id} of the truth table indicates
>>> - * if the source PLL selection bit should be set for each PHY.
>>> - * Fill default H/W values in illegal cells, eg. cell {0, 1}.
>>> - */
>>> - bool src_pll_truthtable[DSI_MAX][DSI_MAX];
>>> const resource_size_t io_start[DSI_MAX];
>>> const int num_dsi_phy;
>>> const int quirks;
>>> @@ -121,7 +115,5 @@ int msm_dsi_dphy_timing_calc_v3(struct
>>> msm_dsi_dphy_timing *timing,
>>> struct msm_dsi_phy_clk_request *clk_req);
>>> int msm_dsi_dphy_timing_calc_v4(struct msm_dsi_dphy_timing *timing,
>>> struct msm_dsi_phy_clk_request *clk_req);
>>> -void msm_dsi_phy_set_src_pll(struct msm_dsi_phy *phy, int pll_id,
>>> u32 reg,
>>> - u32 bit_mask);
>>>
>>> #endif /* __DSI_PHY_H__ */
>>> 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 1fbb54f4df98..04535ccd11ef 100644
>>> --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c
>>> +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c
>>> @@ -919,7 +919,6 @@ static void dsi_10nm_phy_disable(struct
>>> msm_dsi_phy *phy)
>>> }
>>>
>>> const struct msm_dsi_phy_cfg dsi_phy_10nm_cfgs = {
>>> - .src_pll_truthtable = { {false, false}, {true, false} },
>>> .has_phy_lane = true,
>>> .reg_cfg = {
>>> .num = 1,
>>> @@ -941,7 +940,6 @@ const struct msm_dsi_phy_cfg dsi_phy_10nm_cfgs =
>>> {
>>> };
>>>
>>> const struct msm_dsi_phy_cfg dsi_phy_10nm_8998_cfgs = {
>>> - .src_pll_truthtable = { {false, false}, {true, false} },
>>> .has_phy_lane = true,
>>> .reg_cfg = {
>>> .num = 1,
>>> 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 d08ad0c632b4..7a87bed71e36 100644
>>> --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c
>>> +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c
>>> @@ -947,6 +947,7 @@ static int dsi_14nm_phy_enable(struct msm_dsi_phy
>>> *phy, int src_pll_id,
>>> int ret;
>>> void __iomem *base = phy->base;
>>> void __iomem *lane_base = phy->lane_base;
>>> + u32 glbl_test_ctrl;
>>>
>>> if (msm_dsi_dphy_timing_calc_v2(timing, clk_req)) {
>>> DRM_DEV_ERROR(&phy->pdev->dev,
>>> @@ -994,10 +995,12 @@ static int dsi_14nm_phy_enable(struct
>>> msm_dsi_phy *phy, int src_pll_id,
>>> udelay(100);
>>> dsi_phy_write(base + REG_DSI_14nm_PHY_CMN_CTRL_1, 0x00);
>>>
>>> - msm_dsi_phy_set_src_pll(phy, src_pll_id,
>>> - REG_DSI_14nm_PHY_CMN_GLBL_TEST_CTRL,
>>> - DSI_14nm_PHY_CMN_GLBL_TEST_CTRL_BITCLK_HS_SEL);
>>> -
>>> + 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)
>>> + 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;
>>> + dsi_phy_write(base + REG_DSI_14nm_PHY_CMN_GLBL_TEST_CTRL,
>>> glbl_test_ctrl);
>>> ret = dsi_14nm_set_usecase(phy);
>>> if (ret) {
>>> DRM_DEV_ERROR(&phy->pdev->dev, "%s: set pll usecase failed,
>>> %d\n",
>>> @@ -1021,7 +1024,6 @@ static void dsi_14nm_phy_disable(struct
>>> msm_dsi_phy *phy)
>>> }
>>>
>>> const struct msm_dsi_phy_cfg dsi_phy_14nm_cfgs = {
>>> - .src_pll_truthtable = { {false, false}, {true, false} },
>>> .has_phy_lane = true,
>>> .reg_cfg = {
>>> .num = 1,
>>> @@ -1043,7 +1045,6 @@ const struct msm_dsi_phy_cfg dsi_phy_14nm_cfgs
>>> = {
>>> };
>>>
>>> const struct msm_dsi_phy_cfg dsi_phy_14nm_660_cfgs = {
>>> - .src_pll_truthtable = { {false, false}, {true, false} },
>>> .has_phy_lane = true,
>>> .reg_cfg = {
>>> .num = 1,
>>> 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 5e73f811d645..f5b88c85a8fc 100644
>>> --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_20nm.c
>>> +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_20nm.c
>>> @@ -70,6 +70,7 @@ static int dsi_20nm_phy_enable(struct msm_dsi_phy
>>> *phy, int src_pll_id,
>>> int i;
>>> void __iomem *base = phy->base;
>>> u32 cfg_4[4] = {0x20, 0x40, 0x20, 0x00};
>>> + u32 val;
>>>
>>> DBG("");
>>>
>>> @@ -83,9 +84,12 @@ 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);
>>>
>>> - msm_dsi_phy_set_src_pll(phy, src_pll_id,
>>> - REG_DSI_20nm_PHY_GLBL_TEST_CTRL,
>>> - DSI_20nm_PHY_GLBL_TEST_CTRL_BITCLK_HS_SEL);
>>> + val = dsi_phy_read(base + REG_DSI_20nm_PHY_GLBL_TEST_CTRL);
>>> + if (src_pll_id == DSI_1)
>>> + val |= DSI_20nm_PHY_GLBL_TEST_CTRL_BITCLK_HS_SEL;
>>> + else
>>> + val &= ~DSI_20nm_PHY_GLBL_TEST_CTRL_BITCLK_HS_SEL;
>>> + dsi_phy_write(base + REG_DSI_20nm_PHY_GLBL_TEST_CTRL, val);
>>>
>>> for (i = 0; i < 4; i++) {
>>> dsi_phy_write(base + REG_DSI_20nm_PHY_LN_CFG_3(i),
>>> @@ -125,7 +129,6 @@ static void dsi_20nm_phy_disable(struct
>>> msm_dsi_phy *phy)
>>> }
>>>
>>> const struct msm_dsi_phy_cfg dsi_phy_20nm_cfgs = {
>>> - .src_pll_truthtable = { {false, true}, {false, true} },
>>> .has_phy_regulator = true,
>>> .reg_cfg = {
>>> .num = 2,
>>> 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 0bcea3f3eca3..9f83ab90d093 100644
>>> --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c
>>> +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c
>>> @@ -704,6 +704,7 @@ static int dsi_28nm_phy_enable(struct msm_dsi_phy
>>> *phy, int src_pll_id,
>>> struct msm_dsi_dphy_timing *timing = &phy->timing;
>>> int i;
>>> void __iomem *base = phy->base;
>>> + u32 val;
>>>
>>> DBG("");
>>>
>>> @@ -743,9 +744,12 @@ 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);
>>>
>>> - msm_dsi_phy_set_src_pll(phy, src_pll_id,
>>> - REG_DSI_28nm_PHY_GLBL_TEST_CTRL,
>>> - DSI_28nm_PHY_GLBL_TEST_CTRL_BITCLK_HS_SEL);
>>> + val = dsi_phy_read(base + REG_DSI_28nm_PHY_GLBL_TEST_CTRL);
>>> + if (phy->id == DSI_1 && src_pll_id == DSI_0)
>>> + val &= ~DSI_28nm_PHY_GLBL_TEST_CTRL_BITCLK_HS_SEL;
>>> + else
>>> + val |= DSI_28nm_PHY_GLBL_TEST_CTRL_BITCLK_HS_SEL;
>>> + dsi_phy_write(base + REG_DSI_28nm_PHY_GLBL_TEST_CTRL, val);
>>>
>>> return 0;
>>> }
>>> @@ -763,7 +767,6 @@ static void dsi_28nm_phy_disable(struct
>>> msm_dsi_phy *phy)
>>> }
>>>
>>> const struct msm_dsi_phy_cfg dsi_phy_28nm_hpm_cfgs = {
>>> - .src_pll_truthtable = { {true, true}, {false, true} },
>>> .has_phy_regulator = true,
>>> .reg_cfg = {
>>> .num = 1,
>>> @@ -785,7 +788,6 @@ const struct msm_dsi_phy_cfg
>>> dsi_phy_28nm_hpm_cfgs = {
>>> };
>>>
>>> const struct msm_dsi_phy_cfg dsi_phy_28nm_hpm_famb_cfgs = {
>>> - .src_pll_truthtable = { {true, true}, {false, true} },
>>> .has_phy_regulator = true,
>>> .reg_cfg = {
>>> .num = 1,
>>> @@ -807,7 +809,6 @@ const struct msm_dsi_phy_cfg
>>> dsi_phy_28nm_hpm_famb_cfgs = {
>>> };
>>>
>>> const struct msm_dsi_phy_cfg dsi_phy_28nm_lp_cfgs = {
>>> - .src_pll_truthtable = { {true, true}, {true, true} },
>>> .has_phy_regulator = true,
>>> .reg_cfg = {
>>> .num = 1,
>>
>> The src_pll_truthtable for dsi_phy_28nm_lp_cfgs has all entries as
>> true, while the other
>> 28nm_***_cfgs dont. So wouldnt this below logic end up breaking
>> dsi_phy_28nm_lp_cfgs?
>
> 28nm_lp has just one PHY, so second half of the table does not make
> sense at all.
>
> And it is exactly one of the reasons to get rid of it: it might be
> misleading.
>
> Also consider the [0][1] table entry, which is also declared, but it
> is not usable.
Thanks for the clarification. You are right. There is only one PHY for
28nm so the
second row and the second column seem unnecessary. Hence,
Reviewed-by: Abhinav Kumar <abhinavk at codeaurora.org>
>
>>
>>> + if (phy->id == DSI_1 && src_pll_id == DSI_0)
>>> + val &= ~DSI_28nm_PHY_GLBL_TEST_CTRL_BITCLK_HS_SEL;
>>> + else
>>> + val |= DSI_28nm_PHY_GLBL_TEST_CTRL_BITCLK_HS_SEL;
>>> + dsi_phy_write(base + REG_DSI_28nm_PHY_GLBL_TEST_CTRL, val);
>>
>> If so, I think we can leave it in cfg itself since the 28nm phy driver
>> is common and is managed
>> using different config to differentiate the hpm, lp and hpn_famb
>> variants.
>
> I'd prefer to drop it from all the drivers, to have fewer 'declared
> but unused' cases/data.
>
>>> 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 9ddd0adccce3..d2bfe43c9ef1 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
>>> @@ -642,7 +642,6 @@ static void dsi_28nm_phy_disable(struct
>>> msm_dsi_phy *phy)
>>> }
>>>
>>> const struct msm_dsi_phy_cfg dsi_phy_28nm_8960_cfgs = {
>>> - .src_pll_truthtable = { {true, true}, {false, true} },
>>> .has_phy_regulator = true,
>>> .reg_cfg = {
>>> .num = 1,
>>> 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 ce6ae2fba993..619998506b78 100644
>>> --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c
>>> +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c
>>> @@ -955,7 +955,6 @@ static void dsi_7nm_phy_disable(struct
>>> msm_dsi_phy *phy)
>>> }
>>>
>>> const struct msm_dsi_phy_cfg dsi_phy_7nm_cfgs = {
>>> - .src_pll_truthtable = { {false, false}, {true, false} },
>>> .has_phy_lane = true,
>>> .reg_cfg = {
>>> .num = 1,
>>> @@ -978,7 +977,6 @@ const struct msm_dsi_phy_cfg dsi_phy_7nm_cfgs = {
>>> };
>>>
>>> const struct msm_dsi_phy_cfg dsi_phy_7nm_8150_cfgs = {
>>> - .src_pll_truthtable = { {false, false}, {true, false} },
>>> .has_phy_lane = true,
>>> .reg_cfg = {
>>> .num = 1,
More information about the dri-devel
mailing list