| Message ID | 1546894271-25870-4-git-send-email-chandanu@codeaurora.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | List of patches for DP drivers on SnapDragon | expand |
Hi Chandan A few comments in the following. Mostly nitpicks / style stuff, not a throughly review. Sam > +config DRM_MSM_DP_PLL > + bool "Enable DP PLL driver in MSM DRM" So DRM_MSM_DP_PLL cannot be 'm'. > --- a/drivers/gpu/drm/msm/Makefile > +++ b/drivers/gpu/drm/msm/Makefile > @@ -137,4 +137,10 @@ msm-$(CONFIG_DRM_MSM_DSI_14NM_PHY) += dsi/pll/dsi_pll_14nm.o > msm-$(CONFIG_DRM_MSM_DSI_10NM_PHY) += dsi/pll/dsi_pll_10nm.o > endif > > +ifeq ($(CONFIG_DRM_MSM_DP_PLL),y) > +msm-y += dp/pll/dp_pll.o > +msm-y += dp/pll/dp_pll_10nm.o > +msm-y += dp/pll/dp_pll_10nm_util.o > +endif Please write this in the Kbuild caninical style like this: msm-$(DRM_MSM_DP_PLL) += dp/pll/dp_pll.o msm-$(DRM_MSM_DP_PLL) += dp/pll/dp_pll_10nm.o etc. Or even better - descend into msm/dp/pll to build it - this is normal kernel style. > + if (!dp_parser) { > + DRM_ERROR("Parser not initialized.\n"); > + return -EINVAL; > + } > + > + pll_node = of_parse_phandle(pdev->dev.of_node, "pll-node", 0); > + if (!pll_node) { > + DRM_DEV_ERROR(&pdev->dev, "cannot find pll device\n"); > + return -ENXIO; > + } > + > + pll_pdev = of_find_device_by_node(pll_node); > + if (pll_pdev) > + dp_parser->pll = platform_get_drvdata(pll_pdev); > + > + of_node_put(pll_node); > + > + if (!pll_pdev || !dp_parser->pll) { > + DRM_DEV_ERROR(&pdev->dev, "%s: pll driver is not ready\n", __func__); > + return -EPROBE_DEFER; > + } The use of DRM_*ERROR is inconsistent. In one place DRM_ERROR is used, and string ends with '.' In one place DRM_DEV_ERROR is used with a simple string. In one place DRM_DEV_ERROR is used where the __func__ is added as parameter. When reading the code such inconsistencies makes it harder to follow the code. > + > + dp_parser->pll_dev = get_device(&pll_pdev->dev); > + > + return 0; > +} > + > static irqreturn_t dp_display_irq(int irq, void *dev_id) > { > struct dp_display_private *dp = dev_id; > @@ -114,6 +156,12 @@ static int dp_display_bind(struct device *dev, struct device *master, > goto end; > } > > + rc = dp_get_pll(dp); > + if (rc) { > + DRM_ERROR(" DP get PLL instance failed\n"); Any reason why the error is indented with a space? Also, is the DRM*ERROR in dp_get_pll() not enough? > diff --git a/drivers/gpu/drm/msm/dp/dp_power.h b/drivers/gpu/drm/msm/dp/dp_power.h > index 76e2d3b..40d7e73 100644 > --- a/drivers/gpu/drm/msm/dp/dp_power.h > +++ b/drivers/gpu/drm/msm/dp/dp_power.h > @@ -14,6 +14,7 @@ > * @init: initializes the regulators/core clocks/GPIOs/pinctrl > * @deinit: turns off the regulators/core clocks/GPIOs/pinctrl > * @clk_enable: enable/disable the DP clocks > + * @set_link_clk_parent: set the parent of DP link clock > * @set_pixel_clk_parent: set the parent of DP pixel clock > */ > struct dp_power { This chunk is unrelated - it just added some missing doc. Do it belong in another patch? > diff --git a/drivers/gpu/drm/msm/dp/pll/dp_pll.c b/drivers/gpu/drm/msm/dp/pll/dp_pll.c > new file mode 100644 > index 0000000..28f0e92 > --- /dev/null > +++ b/drivers/gpu/drm/msm/dp/pll/dp_pll.c > @@ -0,0 +1,145 @@ > +// SPDX-License-Identifier: GPL-2.0-only > +/* > + * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved. > + */ > + > +#include "dp_pll.h" > + > +int msm_dp_pll_util_parse_dt_clock(struct platform_device *pdev, > + struct msm_dp_pll *pll) > +{ > + u32 i = 0, rc = 0; > + struct dss_module_power *mp = &pll->mp; > + const char *clock_name; > + u32 clock_rate; > + > + mp->num_clk = of_property_count_strings(pdev->dev.of_node, > + "clock-names"); > + if (mp->num_clk <= 0) { > + DRM_ERROR("clocks are not defined\n"); > + goto clk_err; > + } You have a pdev->dev, so use DRM_DEV_ERROR() > + > +struct msm_dp_pll *msm_dp_pll_init(struct platform_device *pdev, > + enum msm_dp_pll_type type, int id) > +{ > + struct device *dev = &pdev->dev; > + struct msm_dp_pll *pll; > + > + switch (type) { > + case MSM_DP_PLL_10NM: > + pll = msm_dp_pll_10nm_init(pdev, id); > + break; > + default: > + pll = ERR_PTR(-ENXIO); > + break; > + } > + > + if (IS_ERR(pll)) { > + DRM_DEV_ERROR(dev, "%s: failed to init DP PLL\n", __func__); > + return pll; > + } > + > + pll->type = type; > + > + DBG("DP:%d PLL registered", id); Avoid rolling your own DEBUG macros. > +} > + > +static const struct of_device_id dp_pll_dt_match[] = { > +#ifdef CONFIG_DRM_MSM_DP_10NM_PLL > + { .compatible = "qcom,dp-pll-10nm" }, > +#endif > + {} > +}; We only have one entry here. > + > +static int dp_pll_driver_probe(struct platform_device *pdev) > +{ > + struct msm_dp_pll *pll; > + struct device *dev = &pdev->dev; > + const struct of_device_id *match; > + enum msm_dp_pll_type type; > + > + match = of_match_node(dp_pll_dt_match, dev->of_node); > + if (!match) > + return -ENODEV; > + > + if (!strcmp(match->compatible, "qcom,dp-pll-10nm")) > + type = MSM_DP_PLL_10NM; > + else > + type = MSM_DP_PLL_MAX; So the if will always be true, because we can only match one compatible - no? > + > + pll = msm_dp_pll_init(pdev, type, 0); > + if (IS_ERR_OR_NULL(pll)) { > + dev_info(dev, > + "%s: pll init failed: %ld, need separate pll clk driver\n", > + __func__, PTR_ERR(pll)); dev_info => DRM_DEV_ERROR > +static int dp_pll_driver_remove(struct platform_device *pdev) > +{ > + struct msm_dp_pll *pll = platform_get_drvdata(pdev); > + > + if (pll) { > + //msm_dsi_pll_destroy(pll); Debug artifact? > +#define PLL_REG_W(base, offset, data) \ > + writel_relaxed((data), (base) + (offset)) > +#define PLL_REG_R(base, offset) readl_relaxed((base) + (offset)) I recall you wrote in the commit message that the _relaxed variants was dropped? > + > +struct msm_dp_pll *msm_dp_pll_init(struct platform_device *pdev, > + enum msm_dp_pll_type type, int id); > + > +int msm_dp_pll_util_parse_dt_clock(struct platform_device *pdev, > + struct msm_dp_pll *pll); Indent of sencond line with additional function arguments has inconsistent indent. Follwo same style in all files, preferable the DRM style. > + > +#ifdef CONFIG_DRM_MSM_DP_10NM_PLL > +struct msm_dp_pll *msm_dp_pll_10nm_init(struct platform_device *pdev, int id); > +#else > +struct msm_dp_pll *msm_dp_pll_10nm_init(struct platform_device *pdev, int id) > +{ > + return ERR_PTR(-ENODEV); > +} > +#endif I cannot see how this works if CONFIG_DRM_MSM_DP_10NM_PLL is not defined. It looks like you have both a function in a header (no static inline?) and a function with the same name in a .c file. Maybe this driver was not built without the CONFIG_DRM_MSM_DP_10NM_PLL set to y? > +/* > + * Display Port PLL driver block diagram for branch clocks > + * > + * +------------------------------+ > + * | DP_VCO_CLK | > + * | | > + * | +-------------------+ | > + * | | (DP PLL/VCO) | | > + * | +---------+---------+ | > + * | v | > + * | +----------+-----------+ | > + * | | hsclk_divsel_clk_src | | > + * | +----------+-----------+ | > + * +------------------------------+ > + * | > + * +------------<---------v------------>----------+ > + * | | > + * +-----v------------+ | > + * | dp_link_clk_src | | > + * | divsel_ten | | > + * +---------+--------+ | > + * | | > + * | | > + * v v > + * Input to DISPCC block | > + * for link clk, crypto clk | > + * and interface clock | > + * | > + * | > + * +--------<------------+-----------------+---<---+ > + * | | | > + * +-------v------+ +--------v-----+ +--------v------+ > + * | vco_divided | | vco_divided | | vco_divided | > + * | _clk_src | | _clk_src | | _clk_src | > + * | | | | | | > + * |divsel_six | | divsel_two | | divsel_four | > + * +-------+------+ +-----+--------+ +--------+------+ > + * | | | > + * v------->----------v-------------<------v > + * | > + * +----------+---------+ > + * | vco_divided_clk | > + * | _src_mux | > + * +---------+----------+ > + * | > + * v > + * Input to DISPCC block > + * for DP pixel clock Nice drawing! Try to avoid mixing space and tabs in the above. > + * > + */ > + > +#include <linux/kernel.h> > +#include <linux/err.h> > +#include <linux/delay.h> > +#include <linux/regmap.h> > +#include <linux/clk.h> Please sort in alphabetic order. > +/* Op structures */ Op => Ops? > +} > + > +static int clk_mux_determine_rate(struct clk_hw *hw, > + struct clk_rate_request *req) > +{ > + int ret = 0; > + > + ret = __clk_mux_determine_rate_closest(hw, req); > + if (ret) > + return ret; > + > + /* Set the new parent of mux if there is a new valid parent */ > + if (hw->clk && req->best_parent_hw->clk) > + clk_set_parent(hw->clk, req->best_parent_hw->clk); Should you check error code here? > + > + return 0; > +} > + > +} > + > +static int dp_pll_10nm_register(struct dp_pll_10nm *pll_10nm) > +{ > + char clk_name[32], parent[32], vco_name[32]; > + struct clk_init_data vco_init = { > + .parent_names = (const char *[]){ "bi_tcxo" }, > + .num_parents = 1, > + .name = vco_name, > + .flags = CLK_IGNORE_UNUSED, > + .ops = &dp_10nm_vco_clk_ops, > + }; > + struct device *dev = &pll_10nm->pdev->dev; > + struct clk_hw **hws = pll_10nm->hws; > + struct clk_hw_onecell_data *hw_data; > + struct clk_hw *hw; > + int num = 0; > + int ret; > + > + DBG("DP->id = %d", pll_10nm->id); Avoid own DBG macros. > + > + DBG("DP PLL%d", id); Again.
Hi Chandan,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on robclark/msm-next]
[also build test ERROR on v5.0-rc1 next-20190108]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Chandan-Uddaraju/List-of-patches-for-DP-drivers-on-SnapDragon/20190109-052537
base: git://people.freedesktop.org/~robclark/linux msm-next
config: arm-allmodconfig (attached as .config)
compiler: arm-linux-gnueabi-gcc (Debian 7.2.0-11) 7.2.0
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
GCC_VERSION=7.2.0 make.cross ARCH=arm
All error/warnings (new ones prefixed by >>):
drivers/gpu/drm/msm/dp/dp_link.c: In function 'dp_link_parse_audio_channel_period':
>> drivers/gpu/drm/msm/dp/dp_link.c:75:33: error: 'DP_TEST_AUDIO_PERIOD_CH1' undeclared (first use in this function); did you mean 'DP_TEST_BIT_DEPTH_10'?
ret = dp_link_get_period(link, DP_TEST_AUDIO_PERIOD_CH1);
^~~~~~~~~~~~~~~~~~~~~~~~
DP_TEST_BIT_DEPTH_10
drivers/gpu/drm/msm/dp/dp_link.c:75:33: note: each undeclared identifier is reported only once for each function it appears in
drivers/gpu/drm/msm/dp/dp_link.c:82:33: error: 'DP_TEST_AUDIO_PERIOD_CH2' undeclared (first use in this function); did you mean 'DP_TEST_AUDIO_PERIOD_CH1'?
ret = dp_link_get_period(link, DP_TEST_AUDIO_PERIOD_CH2);
^~~~~~~~~~~~~~~~~~~~~~~~
DP_TEST_AUDIO_PERIOD_CH1
drivers/gpu/drm/msm/dp/dp_link.c:90:33: error: 'DP_TEST_AUDIO_PERIOD_CH3' undeclared (first use in this function); did you mean 'DP_TEST_AUDIO_PERIOD_CH2'?
ret = dp_link_get_period(link, DP_TEST_AUDIO_PERIOD_CH3);
^~~~~~~~~~~~~~~~~~~~~~~~
DP_TEST_AUDIO_PERIOD_CH2
drivers/gpu/drm/msm/dp/dp_link.c:97:33: error: 'DP_TEST_AUDIO_PERIOD_CH4' undeclared (first use in this function); did you mean 'DP_TEST_AUDIO_PERIOD_CH3'?
ret = dp_link_get_period(link, DP_TEST_AUDIO_PERIOD_CH4);
^~~~~~~~~~~~~~~~~~~~~~~~
DP_TEST_AUDIO_PERIOD_CH3
drivers/gpu/drm/msm/dp/dp_link.c:104:33: error: 'DP_TEST_AUDIO_PERIOD_CH5' undeclared (first use in this function); did you mean 'DP_TEST_AUDIO_PERIOD_CH4'?
ret = dp_link_get_period(link, DP_TEST_AUDIO_PERIOD_CH5);
^~~~~~~~~~~~~~~~~~~~~~~~
DP_TEST_AUDIO_PERIOD_CH4
drivers/gpu/drm/msm/dp/dp_link.c:111:33: error: 'DP_TEST_AUDIO_PERIOD_CH6' undeclared (first use in this function); did you mean 'DP_TEST_AUDIO_PERIOD_CH5'?
ret = dp_link_get_period(link, DP_TEST_AUDIO_PERIOD_CH6);
^~~~~~~~~~~~~~~~~~~~~~~~
DP_TEST_AUDIO_PERIOD_CH5
drivers/gpu/drm/msm/dp/dp_link.c:118:33: error: 'DP_TEST_AUDIO_PERIOD_CH7' undeclared (first use in this function); did you mean 'DP_TEST_AUDIO_PERIOD_CH6'?
ret = dp_link_get_period(link, DP_TEST_AUDIO_PERIOD_CH7);
^~~~~~~~~~~~~~~~~~~~~~~~
DP_TEST_AUDIO_PERIOD_CH6
drivers/gpu/drm/msm/dp/dp_link.c:125:33: error: 'DP_TEST_AUDIO_PERIOD_CH8' undeclared (first use in this function); did you mean 'DP_TEST_AUDIO_PERIOD_CH7'?
ret = dp_link_get_period(link, DP_TEST_AUDIO_PERIOD_CH8);
^~~~~~~~~~~~~~~~~~~~~~~~
DP_TEST_AUDIO_PERIOD_CH7
drivers/gpu/drm/msm/dp/dp_link.c: In function 'dp_link_parse_audio_pattern_type':
drivers/gpu/drm/msm/dp/dp_link.c:143:5: error: 'DP_TEST_AUDIO_PATTERN_TYPE' undeclared (first use in this function); did you mean 'DP_TEST_PHY_PATTERN'?
DP_TEST_AUDIO_PATTERN_TYPE, &data);
^~~~~~~~~~~~~~~~~~~~~~~~~~
DP_TEST_PHY_PATTERN
drivers/gpu/drm/msm/dp/dp_link.c: In function 'dp_link_parse_audio_mode':
>> drivers/gpu/drm/msm/dp/dp_link.c:172:47: error: 'DP_TEST_AUDIO_MODE' undeclared (first use in this function); did you mean 'DP_TEST_LINK_RATE'?
rlen = drm_dp_dpcd_readb(link->aux->drm_aux, DP_TEST_AUDIO_MODE, &data);
^~~~~~~~~~~~~~~~~~
DP_TEST_LINK_RATE
drivers/gpu/drm/msm/dp/dp_link.c: In function 'dp_link_is_video_audio_test_requested':
drivers/gpu/drm/msm/dp/dp_link.c:577:5: error: 'DP_TEST_LINK_AUDIO_PATTERN' undeclared (first use in this function); did you mean 'DP_TEST_LINK_VIDEO_PATTERN'?
DP_TEST_LINK_AUDIO_PATTERN |
^~~~~~~~~~~~~~~~~~~~~~~~~~
DP_TEST_LINK_VIDEO_PATTERN
drivers/gpu/drm/msm/dp/dp_link.c:578:5: error: 'DP_TEST_LINK_AUDIO_DISABLED_VIDEO' undeclared (first use in this function); did you mean 'DP_TEST_LINK_AUDIO_PATTERN'?
DP_TEST_LINK_AUDIO_DISABLED_VIDEO);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
DP_TEST_LINK_AUDIO_PATTERN
drivers/gpu/drm/msm/dp/dp_link.c: In function 'dp_link_is_video_pattern_requested':
drivers/gpu/drm/msm/dp/dp_link.c:974:3: error: 'DP_TEST_LINK_AUDIO_DISABLED_VIDEO' undeclared (first use in this function); did you mean 'DP_TEST_LINK_VIDEO_PATTERN'?
DP_TEST_LINK_AUDIO_DISABLED_VIDEO);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
DP_TEST_LINK_VIDEO_PATTERN
drivers/gpu/drm/msm/dp/dp_link.c: In function 'dp_link_is_audio_pattern_requested':
drivers/gpu/drm/msm/dp/dp_link.c:979:41: error: 'DP_TEST_LINK_AUDIO_PATTERN' undeclared (first use in this function); did you mean 'DP_TEST_LINK_VIDEO_PATTERN'?
return (link->request.test_requested & DP_TEST_LINK_AUDIO_PATTERN);
^~~~~~~~~~~~~~~~~~~~~~~~~~
DP_TEST_LINK_VIDEO_PATTERN
drivers/gpu/drm/msm/dp/dp_link.c: In function 'dp_link_process_request':
drivers/gpu/drm/msm/dp/dp_link.c:1052:28: error: 'DP_TEST_LINK_AUDIO_PATTERN' undeclared (first use in this function); did you mean 'DP_TEST_LINK_VIDEO_PATTERN'?
dp_link->sink_request |= DP_TEST_LINK_AUDIO_PATTERN;
^~~~~~~~~~~~~~~~~~~~~~~~~~
DP_TEST_LINK_VIDEO_PATTERN
drivers/gpu/drm/msm/dp/dp_link.c: In function 'dp_link_get_colorimetry_config':
drivers/gpu/drm/msm/dp/dp_link.c:1078:8: error: 'DP_TEST_DYNAMIC_RANGE_VESA' undeclared (first use in this function); did you mean 'DP_TEST_DYNAMIC_RANGE_CEA'?
cc = DP_TEST_DYNAMIC_RANGE_VESA;
^~~~~~~~~~~~~~~~~~~~~~~~~~
DP_TEST_DYNAMIC_RANGE_CEA
drivers/gpu/drm/msm/dp/dp_link.c: In function 'dp_link_is_video_pattern_requested':
drivers/gpu/drm/msm/dp/dp_link.c:975:1: warning: control reaches end of non-void function [-Wreturn-type]
}
^
drivers/gpu/drm/msm/dp/dp_link.c: In function 'dp_link_is_audio_pattern_requested':
drivers/gpu/drm/msm/dp/dp_link.c:980:1: warning: control reaches end of non-void function [-Wreturn-type]
}
^
--
drivers/gpu/drm/msm/dp/dp_power.c: In function 'dp_power_init':
>> drivers/gpu/drm/msm/dp/dp_power.c:677:28: warning: 'power' may be used uninitialized in this function [-Wmaybe-uninitialized]
pm_runtime_put_sync(&power->pdev->dev);
~~~~~^~~~~~
vim +75 drivers/gpu/drm/msm/dp/dp_link.c
c24ff5297 Chandan Uddaraju 2019-01-07 69
c24ff5297 Chandan Uddaraju 2019-01-07 70 static int dp_link_parse_audio_channel_period(struct dp_link_private *link)
c24ff5297 Chandan Uddaraju 2019-01-07 71 {
c24ff5297 Chandan Uddaraju 2019-01-07 72 int ret = 0;
c24ff5297 Chandan Uddaraju 2019-01-07 73 struct dp_link_test_audio *req = &link->dp_link.test_audio;
c24ff5297 Chandan Uddaraju 2019-01-07 74
c24ff5297 Chandan Uddaraju 2019-01-07 @75 ret = dp_link_get_period(link, DP_TEST_AUDIO_PERIOD_CH1);
c24ff5297 Chandan Uddaraju 2019-01-07 76 if (ret == -EINVAL)
c24ff5297 Chandan Uddaraju 2019-01-07 77 goto exit;
c24ff5297 Chandan Uddaraju 2019-01-07 78
c24ff5297 Chandan Uddaraju 2019-01-07 79 req->test_audio_period_ch_1 = ret;
c24ff5297 Chandan Uddaraju 2019-01-07 80 DRM_DEBUG_DP("test_audio_period_ch_1 = 0x%x\n", ret);
c24ff5297 Chandan Uddaraju 2019-01-07 81
c24ff5297 Chandan Uddaraju 2019-01-07 82 ret = dp_link_get_period(link, DP_TEST_AUDIO_PERIOD_CH2);
c24ff5297 Chandan Uddaraju 2019-01-07 83 if (ret == -EINVAL)
c24ff5297 Chandan Uddaraju 2019-01-07 84 goto exit;
c24ff5297 Chandan Uddaraju 2019-01-07 85
c24ff5297 Chandan Uddaraju 2019-01-07 86 req->test_audio_period_ch_2 = ret;
c24ff5297 Chandan Uddaraju 2019-01-07 87 DRM_DEBUG_DP("test_audio_period_ch_2 = 0x%x\n", ret);
c24ff5297 Chandan Uddaraju 2019-01-07 88
c24ff5297 Chandan Uddaraju 2019-01-07 89 /* TEST_AUDIO_PERIOD_CH_3 (Byte 0x275) */
c24ff5297 Chandan Uddaraju 2019-01-07 90 ret = dp_link_get_period(link, DP_TEST_AUDIO_PERIOD_CH3);
c24ff5297 Chandan Uddaraju 2019-01-07 91 if (ret == -EINVAL)
c24ff5297 Chandan Uddaraju 2019-01-07 92 goto exit;
c24ff5297 Chandan Uddaraju 2019-01-07 93
c24ff5297 Chandan Uddaraju 2019-01-07 94 req->test_audio_period_ch_3 = ret;
c24ff5297 Chandan Uddaraju 2019-01-07 95 DRM_DEBUG_DP("test_audio_period_ch_3 = 0x%x\n", ret);
c24ff5297 Chandan Uddaraju 2019-01-07 96
c24ff5297 Chandan Uddaraju 2019-01-07 97 ret = dp_link_get_period(link, DP_TEST_AUDIO_PERIOD_CH4);
c24ff5297 Chandan Uddaraju 2019-01-07 98 if (ret == -EINVAL)
c24ff5297 Chandan Uddaraju 2019-01-07 99 goto exit;
c24ff5297 Chandan Uddaraju 2019-01-07 100
c24ff5297 Chandan Uddaraju 2019-01-07 101 req->test_audio_period_ch_4 = ret;
c24ff5297 Chandan Uddaraju 2019-01-07 102 DRM_DEBUG_DP("test_audio_period_ch_4 = 0x%x\n", ret);
c24ff5297 Chandan Uddaraju 2019-01-07 103
c24ff5297 Chandan Uddaraju 2019-01-07 104 ret = dp_link_get_period(link, DP_TEST_AUDIO_PERIOD_CH5);
c24ff5297 Chandan Uddaraju 2019-01-07 105 if (ret == -EINVAL)
c24ff5297 Chandan Uddaraju 2019-01-07 106 goto exit;
c24ff5297 Chandan Uddaraju 2019-01-07 107
c24ff5297 Chandan Uddaraju 2019-01-07 108 req->test_audio_period_ch_5 = ret;
c24ff5297 Chandan Uddaraju 2019-01-07 109 DRM_DEBUG_DP("test_audio_period_ch_5 = 0x%x\n", ret);
c24ff5297 Chandan Uddaraju 2019-01-07 110
c24ff5297 Chandan Uddaraju 2019-01-07 111 ret = dp_link_get_period(link, DP_TEST_AUDIO_PERIOD_CH6);
c24ff5297 Chandan Uddaraju 2019-01-07 112 if (ret == -EINVAL)
c24ff5297 Chandan Uddaraju 2019-01-07 113 goto exit;
c24ff5297 Chandan Uddaraju 2019-01-07 114
c24ff5297 Chandan Uddaraju 2019-01-07 115 req->test_audio_period_ch_6 = ret;
c24ff5297 Chandan Uddaraju 2019-01-07 116 DRM_DEBUG_DP("test_audio_period_ch_6 = 0x%x\n", ret);
c24ff5297 Chandan Uddaraju 2019-01-07 117
c24ff5297 Chandan Uddaraju 2019-01-07 118 ret = dp_link_get_period(link, DP_TEST_AUDIO_PERIOD_CH7);
c24ff5297 Chandan Uddaraju 2019-01-07 119 if (ret == -EINVAL)
c24ff5297 Chandan Uddaraju 2019-01-07 120 goto exit;
c24ff5297 Chandan Uddaraju 2019-01-07 121
c24ff5297 Chandan Uddaraju 2019-01-07 122 req->test_audio_period_ch_7 = ret;
c24ff5297 Chandan Uddaraju 2019-01-07 123 DRM_DEBUG_DP("test_audio_period_ch_7 = 0x%x\n", ret);
c24ff5297 Chandan Uddaraju 2019-01-07 124
c24ff5297 Chandan Uddaraju 2019-01-07 125 ret = dp_link_get_period(link, DP_TEST_AUDIO_PERIOD_CH8);
c24ff5297 Chandan Uddaraju 2019-01-07 126 if (ret == -EINVAL)
c24ff5297 Chandan Uddaraju 2019-01-07 127 goto exit;
c24ff5297 Chandan Uddaraju 2019-01-07 128
c24ff5297 Chandan Uddaraju 2019-01-07 129 req->test_audio_period_ch_8 = ret;
c24ff5297 Chandan Uddaraju 2019-01-07 130 DRM_DEBUG_DP("test_audio_period_ch_8 = 0x%x\n", ret);
c24ff5297 Chandan Uddaraju 2019-01-07 131 exit:
c24ff5297 Chandan Uddaraju 2019-01-07 132 return ret;
c24ff5297 Chandan Uddaraju 2019-01-07 133 }
c24ff5297 Chandan Uddaraju 2019-01-07 134
c24ff5297 Chandan Uddaraju 2019-01-07 135 static int dp_link_parse_audio_pattern_type(struct dp_link_private *link)
c24ff5297 Chandan Uddaraju 2019-01-07 136 {
c24ff5297 Chandan Uddaraju 2019-01-07 137 int ret = 0;
c24ff5297 Chandan Uddaraju 2019-01-07 138 u8 data;
c24ff5297 Chandan Uddaraju 2019-01-07 139 ssize_t rlen;
c24ff5297 Chandan Uddaraju 2019-01-07 140 int const max_audio_pattern_type = 0x1;
c24ff5297 Chandan Uddaraju 2019-01-07 141
c24ff5297 Chandan Uddaraju 2019-01-07 142 rlen = drm_dp_dpcd_readb(link->aux->drm_aux,
c24ff5297 Chandan Uddaraju 2019-01-07 @143 DP_TEST_AUDIO_PATTERN_TYPE, &data);
c24ff5297 Chandan Uddaraju 2019-01-07 144 if (rlen < 0) {
c24ff5297 Chandan Uddaraju 2019-01-07 145 DRM_ERROR("failed to read link audio mode. rlen=%zd\n", rlen);
c24ff5297 Chandan Uddaraju 2019-01-07 146 return rlen;
c24ff5297 Chandan Uddaraju 2019-01-07 147 }
c24ff5297 Chandan Uddaraju 2019-01-07 148
c24ff5297 Chandan Uddaraju 2019-01-07 149 /* Audio Pattern Type - Bits 7:0 */
c24ff5297 Chandan Uddaraju 2019-01-07 150 if ((int)data > max_audio_pattern_type) {
c24ff5297 Chandan Uddaraju 2019-01-07 151 DRM_ERROR("invalid audio pattern type = 0x%x\n", data);
c24ff5297 Chandan Uddaraju 2019-01-07 152 ret = -EINVAL;
c24ff5297 Chandan Uddaraju 2019-01-07 153 goto exit;
c24ff5297 Chandan Uddaraju 2019-01-07 154 }
c24ff5297 Chandan Uddaraju 2019-01-07 155
c24ff5297 Chandan Uddaraju 2019-01-07 156 link->dp_link.test_audio.test_audio_pattern_type = data;
c24ff5297 Chandan Uddaraju 2019-01-07 157 DRM_DEBUG_DP("audio pattern type = 0x%x\n", data);
c24ff5297 Chandan Uddaraju 2019-01-07 158 exit:
c24ff5297 Chandan Uddaraju 2019-01-07 159 return ret;
c24ff5297 Chandan Uddaraju 2019-01-07 160 }
c24ff5297 Chandan Uddaraju 2019-01-07 161
c24ff5297 Chandan Uddaraju 2019-01-07 162 static int dp_link_parse_audio_mode(struct dp_link_private *link)
c24ff5297 Chandan Uddaraju 2019-01-07 163 {
c24ff5297 Chandan Uddaraju 2019-01-07 164 int ret = 0;
c24ff5297 Chandan Uddaraju 2019-01-07 165 u8 data;
c24ff5297 Chandan Uddaraju 2019-01-07 166 ssize_t rlen;
c24ff5297 Chandan Uddaraju 2019-01-07 167 int const max_audio_sampling_rate = 0x6;
c24ff5297 Chandan Uddaraju 2019-01-07 168 int const max_audio_channel_count = 0x8;
c24ff5297 Chandan Uddaraju 2019-01-07 169 int sampling_rate = 0x0;
c24ff5297 Chandan Uddaraju 2019-01-07 170 int channel_count = 0x0;
c24ff5297 Chandan Uddaraju 2019-01-07 171
c24ff5297 Chandan Uddaraju 2019-01-07 @172 rlen = drm_dp_dpcd_readb(link->aux->drm_aux, DP_TEST_AUDIO_MODE, &data);
c24ff5297 Chandan Uddaraju 2019-01-07 173 if (rlen < 0) {
c24ff5297 Chandan Uddaraju 2019-01-07 174 DRM_ERROR("failed to read link audio mode. rlen=%zd\n", rlen);
c24ff5297 Chandan Uddaraju 2019-01-07 175 return rlen;
c24ff5297 Chandan Uddaraju 2019-01-07 176 }
c24ff5297 Chandan Uddaraju 2019-01-07 177
c24ff5297 Chandan Uddaraju 2019-01-07 178 /* Sampling Rate - Bits 3:0 */
c24ff5297 Chandan Uddaraju 2019-01-07 179 sampling_rate = data & 0xF;
c24ff5297 Chandan Uddaraju 2019-01-07 180 if (sampling_rate > max_audio_sampling_rate) {
c24ff5297 Chandan Uddaraju 2019-01-07 181 DRM_ERROR("sampling rate (0x%x) greater than max (0x%x)\n",
c24ff5297 Chandan Uddaraju 2019-01-07 182 sampling_rate, max_audio_sampling_rate);
c24ff5297 Chandan Uddaraju 2019-01-07 183 ret = -EINVAL;
c24ff5297 Chandan Uddaraju 2019-01-07 184 goto exit;
c24ff5297 Chandan Uddaraju 2019-01-07 185 }
c24ff5297 Chandan Uddaraju 2019-01-07 186
c24ff5297 Chandan Uddaraju 2019-01-07 187 /* Channel Count - Bits 7:4 */
c24ff5297 Chandan Uddaraju 2019-01-07 188 channel_count = ((data & 0xF0) >> 4) + 1;
c24ff5297 Chandan Uddaraju 2019-01-07 189 if (channel_count > max_audio_channel_count) {
c24ff5297 Chandan Uddaraju 2019-01-07 190 DRM_ERROR("channel_count (0x%x) greater than max (0x%x)\n",
c24ff5297 Chandan Uddaraju 2019-01-07 191 channel_count, max_audio_channel_count);
c24ff5297 Chandan Uddaraju 2019-01-07 192 ret = -EINVAL;
c24ff5297 Chandan Uddaraju 2019-01-07 193 goto exit;
c24ff5297 Chandan Uddaraju 2019-01-07 194 }
c24ff5297 Chandan Uddaraju 2019-01-07 195
c24ff5297 Chandan Uddaraju 2019-01-07 196 link->dp_link.test_audio.test_audio_sampling_rate = sampling_rate;
c24ff5297 Chandan Uddaraju 2019-01-07 197 link->dp_link.test_audio.test_audio_channel_count = channel_count;
c24ff5297 Chandan Uddaraju 2019-01-07 198 DRM_DEBUG_DP("sampling_rate = 0x%x, channel_count = 0x%x\n",
c24ff5297 Chandan Uddaraju 2019-01-07 199 sampling_rate, channel_count);
c24ff5297 Chandan Uddaraju 2019-01-07 200 exit:
c24ff5297 Chandan Uddaraju 2019-01-07 201 return ret;
c24ff5297 Chandan Uddaraju 2019-01-07 202 }
c24ff5297 Chandan Uddaraju 2019-01-07 203
:::::: The code at line 75 was first introduced by commit
:::::: c24ff5297c35cef4b4da979f2889b9291fe59523 drm/msm/dp: add displayPort driver support
:::::: TO: Chandan Uddaraju <chandanu@codeaurora.org>
:::::: CC: 0day robot <lkp@intel.com>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
Hello Sam, Only DP core driver comments have been addressed in V2. PLL driver comments in V1 and your comments in V2 version will be addressed in V3. Responded to your comments/queries below. On 2019-01-07 14:14, Sam Ravnborg wrote: > Hi Chandan > > A few comments in the following. > Mostly nitpicks / style stuff, not a throughly review. > > Sam > >> +config DRM_MSM_DP_PLL >> + bool "Enable DP PLL driver in MSM DRM" > > So DRM_MSM_DP_PLL cannot be 'm'. No, we don't have support for modular driver. > >> --- a/drivers/gpu/drm/msm/Makefile >> +++ b/drivers/gpu/drm/msm/Makefile >> @@ -137,4 +137,10 @@ msm-$(CONFIG_DRM_MSM_DSI_14NM_PHY) += >> dsi/pll/dsi_pll_14nm.o >> msm-$(CONFIG_DRM_MSM_DSI_10NM_PHY) += dsi/pll/dsi_pll_10nm.o >> endif >> >> +ifeq ($(CONFIG_DRM_MSM_DP_PLL),y) >> +msm-y += dp/pll/dp_pll.o >> +msm-y += dp/pll/dp_pll_10nm.o >> +msm-y += dp/pll/dp_pll_10nm_util.o >> +endif > > Please write this in the Kbuild caninical style like this: > msm-$(DRM_MSM_DP_PLL) += dp/pll/dp_pll.o > msm-$(DRM_MSM_DP_PLL) += dp/pll/dp_pll_10nm.o > etc. > Will fix this in V3. > Or even better - descend into msm/dp/pll to build it - this is normal > kernel style. > I am following the existing format in drm/msm folder. >> + if (!dp_parser) { >> + DRM_ERROR("Parser not initialized.\n"); >> + return -EINVAL; >> + } >> + >> + pll_node = of_parse_phandle(pdev->dev.of_node, "pll-node", 0); >> + if (!pll_node) { >> + DRM_DEV_ERROR(&pdev->dev, "cannot find pll device\n"); >> + return -ENXIO; >> + } >> + >> + pll_pdev = of_find_device_by_node(pll_node); >> + if (pll_pdev) >> + dp_parser->pll = platform_get_drvdata(pll_pdev); >> + >> + of_node_put(pll_node); >> + >> + if (!pll_pdev || !dp_parser->pll) { >> + DRM_DEV_ERROR(&pdev->dev, "%s: pll driver is not ready\n", >> __func__); >> + return -EPROBE_DEFER; >> + } > > The use of DRM_*ERROR is inconsistent. > In one place DRM_ERROR is used, and string ends with '.' > In one place DRM_DEV_ERROR is used with a simple string. > In one place DRM_DEV_ERROR is used where the __func__ is added as > parameter. > When reading the code such inconsistencies makes it harder to follow > the code. > Will address this in V3. >> + >> + dp_parser->pll_dev = get_device(&pll_pdev->dev); >> + >> + return 0; >> +} >> + >> static irqreturn_t dp_display_irq(int irq, void *dev_id) >> { >> struct dp_display_private *dp = dev_id; >> @@ -114,6 +156,12 @@ static int dp_display_bind(struct device *dev, >> struct device *master, >> goto end; >> } >> >> + rc = dp_get_pll(dp); >> + if (rc) { >> + DRM_ERROR(" DP get PLL instance failed\n"); > Any reason why the error is indented with a space? > Also, is the DRM*ERROR in dp_get_pll() not enough? > Will fix this in V3. >> diff --git a/drivers/gpu/drm/msm/dp/dp_power.h >> b/drivers/gpu/drm/msm/dp/dp_power.h >> index 76e2d3b..40d7e73 100644 >> --- a/drivers/gpu/drm/msm/dp/dp_power.h >> +++ b/drivers/gpu/drm/msm/dp/dp_power.h >> @@ -14,6 +14,7 @@ >> * @init: initializes the regulators/core clocks/GPIOs/pinctrl >> * @deinit: turns off the regulators/core clocks/GPIOs/pinctrl >> * @clk_enable: enable/disable the DP clocks >> + * @set_link_clk_parent: set the parent of DP link clock >> * @set_pixel_clk_parent: set the parent of DP pixel clock >> */ >> struct dp_power { > > This chunk is unrelated - it just added some missing doc. > Do it belong in another patch? > Will remove this in V3. >> diff --git a/drivers/gpu/drm/msm/dp/pll/dp_pll.c >> b/drivers/gpu/drm/msm/dp/pll/dp_pll.c >> new file mode 100644 >> index 0000000..28f0e92 >> --- /dev/null >> +++ b/drivers/gpu/drm/msm/dp/pll/dp_pll.c >> @@ -0,0 +1,145 @@ >> +// SPDX-License-Identifier: GPL-2.0-only >> +/* >> + * Copyright (c) 2016-2019, The Linux Foundation. All rights >> reserved. >> + */ >> + >> +#include "dp_pll.h" >> + >> +int msm_dp_pll_util_parse_dt_clock(struct platform_device *pdev, >> + struct msm_dp_pll *pll) >> +{ >> + u32 i = 0, rc = 0; >> + struct dss_module_power *mp = &pll->mp; >> + const char *clock_name; >> + u32 clock_rate; >> + >> + mp->num_clk = of_property_count_strings(pdev->dev.of_node, >> + "clock-names"); >> + if (mp->num_clk <= 0) { >> + DRM_ERROR("clocks are not defined\n"); >> + goto clk_err; >> + } > You have a pdev->dev, so use DRM_DEV_ERROR() > >> + >> +struct msm_dp_pll *msm_dp_pll_init(struct platform_device *pdev, >> + enum msm_dp_pll_type type, int id) >> +{ >> + struct device *dev = &pdev->dev; >> + struct msm_dp_pll *pll; >> + >> + switch (type) { >> + case MSM_DP_PLL_10NM: >> + pll = msm_dp_pll_10nm_init(pdev, id); >> + break; >> + default: >> + pll = ERR_PTR(-ENXIO); >> + break; >> + } >> + >> + if (IS_ERR(pll)) { >> + DRM_DEV_ERROR(dev, "%s: failed to init DP PLL\n", __func__); >> + return pll; >> + } >> + >> + pll->type = type; >> + >> + DBG("DP:%d PLL registered", id); > Avoid rolling your own DEBUG macros. > Will fix this in V3. >> +} >> + >> +static const struct of_device_id dp_pll_dt_match[] = { >> +#ifdef CONFIG_DRM_MSM_DP_10NM_PLL >> + { .compatible = "qcom,dp-pll-10nm" }, >> +#endif >> + {} >> +}; > We only have one entry here. > Will remove the ifdefs in V3. >> + >> +static int dp_pll_driver_probe(struct platform_device *pdev) >> +{ >> + struct msm_dp_pll *pll; >> + struct device *dev = &pdev->dev; >> + const struct of_device_id *match; >> + enum msm_dp_pll_type type; >> + >> + match = of_match_node(dp_pll_dt_match, dev->of_node); >> + if (!match) >> + return -ENODEV; >> + >> + if (!strcmp(match->compatible, "qcom,dp-pll-10nm")) >> + type = MSM_DP_PLL_10NM; >> + else >> + type = MSM_DP_PLL_MAX; > So the if will always be true, because we can only match one compatible > - no? > Yes, you are right. Will remove this unnecessary check in v3. > >> + >> + pll = msm_dp_pll_init(pdev, type, 0); >> + if (IS_ERR_OR_NULL(pll)) { >> + dev_info(dev, >> + "%s: pll init failed: %ld, need separate pll clk driver\n", >> + __func__, PTR_ERR(pll)); > dev_info => DRM_DEV_ERROR > Will fix this in V3. > >> +static int dp_pll_driver_remove(struct platform_device *pdev) >> +{ >> + struct msm_dp_pll *pll = platform_get_drvdata(pdev); >> + >> + if (pll) { >> + //msm_dsi_pll_destroy(pll); > Debug artifact? > Will fix this in V3. > >> +#define PLL_REG_W(base, offset, data) \ >> + writel_relaxed((data), (base) + (offset)) >> +#define PLL_REG_R(base, offset) readl_relaxed((base) + (offset)) > I recall you wrote in the commit message that the _relaxed > variants was dropped? > Only DP core driver comments have been addressed in V2. PLL driver comments will be fixed in V3. >> + >> +struct msm_dp_pll *msm_dp_pll_init(struct platform_device *pdev, >> + enum msm_dp_pll_type type, int id); >> + >> +int msm_dp_pll_util_parse_dt_clock(struct platform_device *pdev, >> + struct msm_dp_pll *pll); > Indent of sencond line with additional function arguments > has inconsistent indent. > Follwo same style in all files, preferable the DRM style. > Will fix them in V3. >> + >> +#ifdef CONFIG_DRM_MSM_DP_10NM_PLL >> +struct msm_dp_pll *msm_dp_pll_10nm_init(struct platform_device *pdev, >> int id); >> +#else >> +struct msm_dp_pll *msm_dp_pll_10nm_init(struct platform_device *pdev, >> int id) >> +{ >> + return ERR_PTR(-ENODEV); >> +} >> +#endif > I cannot see how this works if CONFIG_DRM_MSM_DP_10NM_PLL is not > defined. > It looks like you have both a function in a header (no static inline?) > and a function with the same name in a .c file. > Maybe this driver was not built without the CONFIG_DRM_MSM_DP_10NM_PLL > set to y? > >> +/* >> + * Display Port PLL driver block diagram for branch clocks >> + * >> + * +------------------------------+ >> + * | DP_VCO_CLK | >> + * | | >> + * | +-------------------+ | >> + * | | (DP PLL/VCO) | | >> + * | +---------+---------+ | >> + * | v | >> + * | +----------+-----------+ | >> + * | | hsclk_divsel_clk_src | | >> + * | +----------+-----------+ | >> + * +------------------------------+ >> + * | >> + * +------------<---------v------------>----------+ >> + * | | >> + * +-----v------------+ | >> + * | dp_link_clk_src | | >> + * | divsel_ten | | >> + * +---------+--------+ | >> + * | | >> + * | | >> + * v v >> + * Input to DISPCC block | >> + * for link clk, crypto clk | >> + * and interface clock | >> + * | >> + * | >> + * +--------<------------+-----------------+---<---+ >> + * | | | >> + * +-------v------+ +--------v-----+ +--------v------+ >> + * | vco_divided | | vco_divided | | vco_divided | >> + * | _clk_src | | _clk_src | | _clk_src | >> + * | | | | | | >> + * |divsel_six | | divsel_two | | divsel_four | >> + * +-------+------+ +-----+--------+ +--------+------+ >> + * | | | >> + * v------->----------v-------------<------v >> + * | >> + * +----------+---------+ >> + * | vco_divided_clk | >> + * | _src_mux | >> + * +---------+----------+ >> + * | >> + * v >> + * Input to DISPCC block >> + * for DP pixel clock > Nice drawing! > Try to avoid mixing space and tabs in the above. > > Will be addressed in V3. >> + * >> + */ >> + >> +#include <linux/kernel.h> >> +#include <linux/err.h> >> +#include <linux/delay.h> >> +#include <linux/regmap.h> >> +#include <linux/clk.h> > Please sort in alphabetic order. > Will fix this in V3. >> +/* Op structures */ > Op => Ops? > Will address this in V3. >> +} >> + >> +static int clk_mux_determine_rate(struct clk_hw *hw, >> + struct clk_rate_request *req) >> +{ >> + int ret = 0; >> + >> + ret = __clk_mux_determine_rate_closest(hw, req); >> + if (ret) >> + return ret; >> + >> + /* Set the new parent of mux if there is a new valid parent */ >> + if (hw->clk && req->best_parent_hw->clk) >> + clk_set_parent(hw->clk, req->best_parent_hw->clk); > Should you check error code here? > Will fix this in V3. >> + >> + return 0; >> +} >> + >> +} >> + >> +static int dp_pll_10nm_register(struct dp_pll_10nm *pll_10nm) >> +{ >> + char clk_name[32], parent[32], vco_name[32]; >> + struct clk_init_data vco_init = { >> + .parent_names = (const char *[]){ "bi_tcxo" }, >> + .num_parents = 1, >> + .name = vco_name, >> + .flags = CLK_IGNORE_UNUSED, >> + .ops = &dp_10nm_vco_clk_ops, >> + }; >> + struct device *dev = &pll_10nm->pdev->dev; >> + struct clk_hw **hws = pll_10nm->hws; >> + struct clk_hw_onecell_data *hw_data; >> + struct clk_hw *hw; >> + int num = 0; >> + int ret; >> + >> + DBG("DP->id = %d", pll_10nm->id); > Avoid own DBG macros. > >> + >> + DBG("DP PLL%d", id); > Again. Will replace DBG with DRM_DEBUG_DP in V3. Thanks Chandan
diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig index c6b2e07..2168432 100644 --- a/drivers/gpu/drm/msm/Kconfig +++ b/drivers/gpu/drm/msm/Kconfig @@ -58,6 +58,21 @@ config DRM_MSM_DP display support is enabled through this config option. It can be primary or secondary display on device. +config DRM_MSM_DP_PLL + bool "Enable DP PLL driver in MSM DRM" + depends on DRM_MSM_DP && COMMON_CLK + default y + help + Choose this option to enable DP PLL driver which provides DP + source clocks under common clock framework. + +config DRM_MSM_DP_10NM_PLL + bool "Enable DP 10nm PLL driver in MSM DRM (used by SDM845)" + depends on DRM_MSM_DP + default y + help + Choose this option if DP PLL on SDM845 is used on the platform. + config DRM_MSM_DSI bool "Enable DSI support in MSM DRM driver" depends on DRM_MSM diff --git a/drivers/gpu/drm/msm/Makefile b/drivers/gpu/drm/msm/Makefile index 45166ef..77f45b1 100644 --- a/drivers/gpu/drm/msm/Makefile +++ b/drivers/gpu/drm/msm/Makefile @@ -137,4 +137,10 @@ msm-$(CONFIG_DRM_MSM_DSI_14NM_PHY) += dsi/pll/dsi_pll_14nm.o msm-$(CONFIG_DRM_MSM_DSI_10NM_PHY) += dsi/pll/dsi_pll_10nm.o endif +ifeq ($(CONFIG_DRM_MSM_DP_PLL),y) +msm-y += dp/pll/dp_pll.o +msm-y += dp/pll/dp_pll_10nm.o +msm-y += dp/pll/dp_pll_10nm_util.o +endif + obj-$(CONFIG_DRM_MSM) += msm.o diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c index 1b0682a..212e247 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -61,6 +61,48 @@ struct dp_display_private { {} }; +static int dp_get_pll(struct dp_display_private *dp_priv) +{ + struct platform_device *pdev = NULL; + struct platform_device *pll_pdev; + struct device_node *pll_node; + struct dp_parser *dp_parser = NULL; + + if (!dp_priv) { + DRM_ERROR("Invalid Arguments\n"); + return -EINVAL; + } + + pdev = dp_priv->pdev; + dp_parser = dp_priv->parser; + + if (!dp_parser) { + DRM_ERROR("Parser not initialized.\n"); + return -EINVAL; + } + + pll_node = of_parse_phandle(pdev->dev.of_node, "pll-node", 0); + if (!pll_node) { + DRM_DEV_ERROR(&pdev->dev, "cannot find pll device\n"); + return -ENXIO; + } + + pll_pdev = of_find_device_by_node(pll_node); + if (pll_pdev) + dp_parser->pll = platform_get_drvdata(pll_pdev); + + of_node_put(pll_node); + + if (!pll_pdev || !dp_parser->pll) { + DRM_DEV_ERROR(&pdev->dev, "%s: pll driver is not ready\n", __func__); + return -EPROBE_DEFER; + } + + dp_parser->pll_dev = get_device(&pll_pdev->dev); + + return 0; +} + static irqreturn_t dp_display_irq(int irq, void *dev_id) { struct dp_display_private *dp = dev_id; @@ -114,6 +156,12 @@ static int dp_display_bind(struct device *dev, struct device *master, goto end; } + rc = dp_get_pll(dp); + if (rc) { + DRM_ERROR(" DP get PLL instance failed\n"); + goto end; + } + rc = dp_aux_register(dp->aux); if (rc) { DRM_ERROR("DRM DP AUX register failed\n"); @@ -804,6 +852,7 @@ int __init msm_dp_register(void) { int ret; + msm_dp_pll_driver_register(); ret = platform_driver_register(&dp_display_driver); if (ret) { DRM_ERROR("driver register failed"); @@ -815,6 +864,7 @@ int __init msm_dp_register(void) void __exit msm_dp_unregister(void) { + msm_dp_pll_driver_unregister(); platform_driver_unregister(&dp_display_driver); } diff --git a/drivers/gpu/drm/msm/dp/dp_display.h b/drivers/gpu/drm/msm/dp/dp_display.h index ce09bb6..3aa6bf7 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.h +++ b/drivers/gpu/drm/msm/dp/dp_display.h @@ -25,4 +25,7 @@ int dp_display_get_modes(struct msm_dp *dp_display, bool dp_display_check_video_test(struct msm_dp *dp_display); int dp_display_get_test_bpp(struct msm_dp *dp_display); +void __init msm_dp_pll_driver_register(void); +void __exit msm_dp_pll_driver_unregister(void); + #endif /* _DP_DISPLAY_H_ */ diff --git a/drivers/gpu/drm/msm/dp/dp_parser.h b/drivers/gpu/drm/msm/dp/dp_parser.h index e35a50b..166f41e 100644 --- a/drivers/gpu/drm/msm/dp/dp_parser.h +++ b/drivers/gpu/drm/msm/dp/dp_parser.h @@ -7,6 +7,7 @@ #define _DP_PARSER_H_ #include "dpu_io_util.h" +#include "pll/dp_pll.h" #define DP_LABEL "MDSS DP DISPLAY" #define AUX_CFG_LEN 10 @@ -166,6 +167,8 @@ struct dp_parser { struct dp_pinctrl pinctrl; struct dp_io io; struct dp_display_data disp_data; + struct msm_dp_pll *pll; + struct device *pll_dev; u8 l_map[4]; struct dp_aux_cfg aux_cfg[AUX_CFG_LEN]; diff --git a/drivers/gpu/drm/msm/dp/dp_power.h b/drivers/gpu/drm/msm/dp/dp_power.h index 76e2d3b..40d7e73 100644 --- a/drivers/gpu/drm/msm/dp/dp_power.h +++ b/drivers/gpu/drm/msm/dp/dp_power.h @@ -14,6 +14,7 @@ * @init: initializes the regulators/core clocks/GPIOs/pinctrl * @deinit: turns off the regulators/core clocks/GPIOs/pinctrl * @clk_enable: enable/disable the DP clocks + * @set_link_clk_parent: set the parent of DP link clock * @set_pixel_clk_parent: set the parent of DP pixel clock */ struct dp_power { diff --git a/drivers/gpu/drm/msm/dp/pll/dp_pll.c b/drivers/gpu/drm/msm/dp/pll/dp_pll.c new file mode 100644 index 0000000..28f0e92 --- /dev/null +++ b/drivers/gpu/drm/msm/dp/pll/dp_pll.c @@ -0,0 +1,145 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved. + */ + +#include "dp_pll.h" + +int msm_dp_pll_util_parse_dt_clock(struct platform_device *pdev, + struct msm_dp_pll *pll) +{ + u32 i = 0, rc = 0; + struct dss_module_power *mp = &pll->mp; + const char *clock_name; + u32 clock_rate; + + mp->num_clk = of_property_count_strings(pdev->dev.of_node, + "clock-names"); + if (mp->num_clk <= 0) { + DRM_ERROR("clocks are not defined\n"); + goto clk_err; + } + + mp->clk_config = devm_kzalloc(&pdev->dev, + sizeof(struct dss_clk) * mp->num_clk, GFP_KERNEL); + if (!mp->clk_config) { + rc = -ENOMEM; + mp->num_clk = 0; + goto clk_err; + } + + for (i = 0; i < mp->num_clk; i++) { + of_property_read_string_index(pdev->dev.of_node, "clock-names", + i, &clock_name); + strlcpy(mp->clk_config[i].clk_name, clock_name, + sizeof(mp->clk_config[i].clk_name)); + + of_property_read_u32_index(pdev->dev.of_node, "clock-rate", + i, &clock_rate); + mp->clk_config[i].rate = clock_rate; + + if (!clock_rate) + mp->clk_config[i].type = DSS_CLK_AHB; + else + mp->clk_config[i].type = DSS_CLK_PCLK; + } + +clk_err: + return rc; +} + +struct msm_dp_pll *msm_dp_pll_init(struct platform_device *pdev, + enum msm_dp_pll_type type, int id) +{ + struct device *dev = &pdev->dev; + struct msm_dp_pll *pll; + + switch (type) { + case MSM_DP_PLL_10NM: + pll = msm_dp_pll_10nm_init(pdev, id); + break; + default: + pll = ERR_PTR(-ENXIO); + break; + } + + if (IS_ERR(pll)) { + DRM_DEV_ERROR(dev, "%s: failed to init DP PLL\n", __func__); + return pll; + } + + pll->type = type; + + DBG("DP:%d PLL registered", id); + + return pll; +} + +static const struct of_device_id dp_pll_dt_match[] = { +#ifdef CONFIG_DRM_MSM_DP_10NM_PLL + { .compatible = "qcom,dp-pll-10nm" }, +#endif + {} +}; + +static int dp_pll_driver_probe(struct platform_device *pdev) +{ + struct msm_dp_pll *pll; + struct device *dev = &pdev->dev; + const struct of_device_id *match; + enum msm_dp_pll_type type; + + match = of_match_node(dp_pll_dt_match, dev->of_node); + if (!match) + return -ENODEV; + + if (!strcmp(match->compatible, "qcom,dp-pll-10nm")) + type = MSM_DP_PLL_10NM; + else + type = MSM_DP_PLL_MAX; + + pll = msm_dp_pll_init(pdev, type, 0); + if (IS_ERR_OR_NULL(pll)) { + dev_info(dev, + "%s: pll init failed: %ld, need separate pll clk driver\n", + __func__, PTR_ERR(pll)); + return -ENODEV; + } + + platform_set_drvdata(pdev, pll); + + return 0; +} + +static int dp_pll_driver_remove(struct platform_device *pdev) +{ + struct msm_dp_pll *pll = platform_get_drvdata(pdev); + + if (pll) { + //msm_dsi_pll_destroy(pll); + pll = NULL; + } + + platform_set_drvdata(pdev, NULL); + + return 0; +} + +static struct platform_driver dp_pll_platform_driver = { + .probe = dp_pll_driver_probe, + .remove = dp_pll_driver_remove, + .driver = { + .name = "msm_dp_pll", + .of_match_table = dp_pll_dt_match, + }, +}; + +void __init msm_dp_pll_driver_register(void) +{ + platform_driver_register(&dp_pll_platform_driver); +} + +void __exit msm_dp_pll_driver_unregister(void) +{ + platform_driver_unregister(&dp_pll_platform_driver); +} diff --git a/drivers/gpu/drm/msm/dp/pll/dp_pll.h b/drivers/gpu/drm/msm/dp/pll/dp_pll.h new file mode 100644 index 0000000..b126b0d --- /dev/null +++ b/drivers/gpu/drm/msm/dp/pll/dp_pll.h @@ -0,0 +1,56 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved. + */ + +#ifndef __DP_PLL_H +#define __DP_PLL_H + +#include <linux/clk.h> +#include <linux/clk-provider.h> +#include <linux/platform_device.h> + +#include "dpu_io_util.h" +#include "msm_drv.h" + +#define PLL_REG_W(base, offset, data) \ + writel_relaxed((data), (base) + (offset)) +#define PLL_REG_R(base, offset) readl_relaxed((base) + (offset)) + +enum msm_dp_pll_type { + MSM_DP_PLL_10NM, + MSM_DP_PLL_MAX +}; + +struct msm_dp_pll { + enum msm_dp_pll_type type; + struct clk_hw clk_hw; + unsigned long rate; /* current vco rate */ + u64 min_rate; /* min vco rate */ + u64 max_rate; /* max vco rate */ + bool pll_on; + void *priv; + /* Pll specific resources like GPIO, power supply, clocks, etc*/ + struct dss_module_power mp; + int (*get_provider)(struct msm_dp_pll *pll, + struct clk **link_clk_provider, + struct clk **pixel_clk_provider); +}; + +#define hw_clk_to_pll(x) container_of(x, struct msm_dp_pll, clk_hw) + +struct msm_dp_pll *msm_dp_pll_init(struct platform_device *pdev, + enum msm_dp_pll_type type, int id); + +int msm_dp_pll_util_parse_dt_clock(struct platform_device *pdev, + struct msm_dp_pll *pll); + +#ifdef CONFIG_DRM_MSM_DP_10NM_PLL +struct msm_dp_pll *msm_dp_pll_10nm_init(struct platform_device *pdev, int id); +#else +struct msm_dp_pll *msm_dp_pll_10nm_init(struct platform_device *pdev, int id) +{ + return ERR_PTR(-ENODEV); +} +#endif +#endif /* __DP_PLL_H */ diff --git a/drivers/gpu/drm/msm/dp/pll/dp_pll_10nm.c b/drivers/gpu/drm/msm/dp/pll/dp_pll_10nm.c new file mode 100644 index 0000000..88bb50d --- /dev/null +++ b/drivers/gpu/drm/msm/dp/pll/dp_pll_10nm.c @@ -0,0 +1,393 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved. + */ + +/* + * Display Port PLL driver block diagram for branch clocks + * + * +------------------------------+ + * | DP_VCO_CLK | + * | | + * | +-------------------+ | + * | | (DP PLL/VCO) | | + * | +---------+---------+ | + * | v | + * | +----------+-----------+ | + * | | hsclk_divsel_clk_src | | + * | +----------+-----------+ | + * +------------------------------+ + * | + * +------------<---------v------------>----------+ + * | | + * +-----v------------+ | + * | dp_link_clk_src | | + * | divsel_ten | | + * +---------+--------+ | + * | | + * | | + * v v + * Input to DISPCC block | + * for link clk, crypto clk | + * and interface clock | + * | + * | + * +--------<------------+-----------------+---<---+ + * | | | + * +-------v------+ +--------v-----+ +--------v------+ + * | vco_divided | | vco_divided | | vco_divided | + * | _clk_src | | _clk_src | | _clk_src | + * | | | | | | + * |divsel_six | | divsel_two | | divsel_four | + * +-------+------+ +-----+--------+ +--------+------+ + * | | | + * v------->----------v-------------<------v + * | + * +----------+---------+ + * | vco_divided_clk | + * | _src_mux | + * +---------+----------+ + * | + * v + * Input to DISPCC block + * for DP pixel clock + * + */ + +#include <linux/kernel.h> +#include <linux/err.h> +#include <linux/delay.h> +#include <linux/regmap.h> +#include <linux/clk.h> + +#include "dp_pll_10nm.h" + +#define NUM_PROVIDED_CLKS 2 + +#define DP_LINK_CLK_SRC 0 +#define DP_PIXEL_CLK_SRC 1 + +static struct dp_pll_10nm *dp_pdb; + +/* Op structures */ +static const struct clk_ops dp_10nm_vco_clk_ops = { + .recalc_rate = dp_vco_recalc_rate_10nm, + .set_rate = dp_vco_set_rate_10nm, + .round_rate = dp_vco_round_rate_10nm, + .prepare = dp_vco_prepare_10nm, + .unprepare = dp_vco_unprepare_10nm, +}; + +struct dp_pll_10nm_pclksel { + struct clk_hw hw; + + /* divider params */ + u8 shift; + u8 width; + u8 flags; /* same flags as used by clk_divider struct */ + + struct dp_pll_10nm *pll; +}; +#define to_pll_10nm_pclksel(_hw) container_of(_hw, struct dp_pll_10nm_pclksel, hw) + +static int dp_mux_set_parent_10nm(struct clk_hw *hw, u8 val) +{ + struct dp_pll_10nm_pclksel *pclksel = to_pll_10nm_pclksel(hw); + struct dp_pll_10nm *dp_res = pclksel->pll; + u32 auxclk_div; + + auxclk_div = PLL_REG_R(dp_res->phy_base, REG_DP_PHY_VCO_DIV); + auxclk_div &= ~0x03; /* bits 0 to 1 */ + + if (val == 0) /* mux parent index = 0 */ + auxclk_div |= 1; + else if (val == 1) /* mux parent index = 1 */ + auxclk_div |= 2; + else if (val == 2) /* mux parent index = 2 */ + auxclk_div |= 0; + + PLL_REG_W(dp_res->phy_base, + REG_DP_PHY_VCO_DIV, auxclk_div); + /* Make sure the PHY registers writes are done */ + wmb(); + DRM_DEBUG_DP("%s: mux=%d auxclk_div=%x\n", __func__, val, auxclk_div); + + return 0; +} + +static u8 dp_mux_get_parent_10nm(struct clk_hw *hw) +{ + u32 auxclk_div = 0; + struct dp_pll_10nm_pclksel *pclksel = to_pll_10nm_pclksel(hw); + struct dp_pll_10nm *dp_res = pclksel->pll; + u8 val = 0; + + DRM_ERROR("clk_hw->init->name = %s\n", hw->init->name); + auxclk_div = PLL_REG_R(dp_res->phy_base, REG_DP_PHY_VCO_DIV); + auxclk_div &= 0x03; + + if (auxclk_div == 1) /* Default divider */ + val = 0; + else if (auxclk_div == 2) + val = 1; + else if (auxclk_div == 0) + val = 2; + + DRM_DEBUG_DP("%s: auxclk_div=%d, val=%d\n", __func__, auxclk_div, val); + + return val; +} + +static int clk_mux_determine_rate(struct clk_hw *hw, + struct clk_rate_request *req) +{ + int ret = 0; + + ret = __clk_mux_determine_rate_closest(hw, req); + if (ret) + return ret; + + /* Set the new parent of mux if there is a new valid parent */ + if (hw->clk && req->best_parent_hw->clk) + clk_set_parent(hw->clk, req->best_parent_hw->clk); + + return 0; +} + +static unsigned long mux_recalc_rate(struct clk_hw *hw, + unsigned long parent_rate) +{ + struct clk *div_clk = NULL, *vco_clk = NULL; + struct msm_dp_pll *vco = NULL; + + div_clk = clk_get_parent(hw->clk); + if (!div_clk) + return 0; + + vco_clk = clk_get_parent(div_clk); + if (!vco_clk) + return 0; + + vco = hw_clk_to_pll(__clk_get_hw(vco_clk)); + if (!vco) + return 0; + + if (vco->rate == DP_VCO_HSCLK_RATE_8100MHZDIV1000) + return (vco->rate / 6); + else if (vco->rate == DP_VCO_HSCLK_RATE_5400MHZDIV1000) + return (vco->rate / 4); + else + return (vco->rate / 2); +} + +static int dp_pll_10nm_get_provider(struct msm_dp_pll *pll, + struct clk **link_clk_provider, + struct clk **pixel_clk_provider) +{ + struct dp_pll_10nm *pll_10nm = to_dp_pll_10nm(pll); + struct clk_hw_onecell_data *hw_data = pll_10nm->hw_data; + + if (link_clk_provider) + *link_clk_provider = hw_data->hws[DP_LINK_CLK_SRC]->clk; + if (pixel_clk_provider) + *pixel_clk_provider = hw_data->hws[DP_PIXEL_CLK_SRC]->clk; + + return 0; +} + +static const struct clk_ops dp_10nm_pclksel_clk_ops = { + .get_parent = dp_mux_get_parent_10nm, + .set_parent = dp_mux_set_parent_10nm, + .recalc_rate = mux_recalc_rate, + .determine_rate = clk_mux_determine_rate, +}; + +static struct clk_hw *dp_pll_10nm_pixel_clk_sel(struct dp_pll_10nm *pll_10nm) +{ + struct device *dev = &pll_10nm->pdev->dev; + struct dp_pll_10nm_pclksel *pll_pclksel; + struct clk_init_data pclksel_init = { + .parent_names = (const char *[]){ + "dp_vco_divsel_two_clk_src", + "dp_vco_divsel_four_clk_src", + "dp_vco_divsel_six_clk_src" }, + .num_parents = 3, + .name = "dp_vco_divided_clk_src_mux", + .flags = CLK_IGNORE_UNUSED, + .ops = &dp_10nm_pclksel_clk_ops, + }; + int ret; + + pll_pclksel = devm_kzalloc(dev, sizeof(*pll_pclksel), GFP_KERNEL); + if (!pll_pclksel) + return ERR_PTR(-ENOMEM); + + pll_pclksel->pll = pll_10nm; + pll_pclksel->shift = 0; + pll_pclksel->width = 4; + pll_pclksel->flags = CLK_DIVIDER_ONE_BASED; + pll_pclksel->hw.init = &pclksel_init; + + ret = clk_hw_register(dev, &pll_pclksel->hw); + if (ret) + return ERR_PTR(ret); + + return &pll_pclksel->hw; +} + +static int dp_pll_10nm_register(struct dp_pll_10nm *pll_10nm) +{ + char clk_name[32], parent[32], vco_name[32]; + struct clk_init_data vco_init = { + .parent_names = (const char *[]){ "bi_tcxo" }, + .num_parents = 1, + .name = vco_name, + .flags = CLK_IGNORE_UNUSED, + .ops = &dp_10nm_vco_clk_ops, + }; + struct device *dev = &pll_10nm->pdev->dev; + struct clk_hw **hws = pll_10nm->hws; + struct clk_hw_onecell_data *hw_data; + struct clk_hw *hw; + int num = 0; + int ret; + + DBG("DP->id = %d", pll_10nm->id); + + hw_data = devm_kzalloc(dev, sizeof(*hw_data) + + NUM_PROVIDED_CLKS * sizeof(struct clk_hw *), + GFP_KERNEL); + if (!hw_data) + return -ENOMEM; + + snprintf(vco_name, 32, "dp_vco_clk"); + pll_10nm->base.clk_hw.init = &vco_init; + ret = clk_hw_register(dev, &pll_10nm->base.clk_hw); + if (ret) + return ret; + hws[num++] = &pll_10nm->base.clk_hw; + + snprintf(clk_name, 32, "dp_link_clk_divsel_ten"); + snprintf(parent, 32, "dp_vco_clk"); + hw = clk_hw_register_fixed_factor(dev, clk_name, parent, + CLK_SET_RATE_PARENT, 1, 10); + if (IS_ERR(hw)) + return PTR_ERR(hw); + hws[num++] = hw; + hw_data->hws[DP_LINK_CLK_SRC] = hw; + + snprintf(clk_name, 32, "dp_vco_divsel_two_clk_src"); + snprintf(parent, 32, "dp_vco_clk"); + hw = clk_hw_register_fixed_factor(dev, clk_name, parent, + 0, 1, 2); + if (IS_ERR(hw)) + return PTR_ERR(hw); + hws[num++] = hw; + + snprintf(clk_name, 32, "dp_vco_divsel_four_clk_src"); + snprintf(parent, 32, "dp_vco_clk"); + hw = clk_hw_register_fixed_factor(dev, clk_name, parent, + 0, 1, 4); + if (IS_ERR(hw)) + return PTR_ERR(hw); + hws[num++] = hw; + + snprintf(clk_name, 32, "dp_vco_divsel_six_clk_src"); + snprintf(parent, 32, "dp_vco_clk"); + hw = clk_hw_register_fixed_factor(dev, clk_name, parent, + 0, 1, 6); + if (IS_ERR(hw)) + return PTR_ERR(hw); + hws[num++] = hw; + + hw = dp_pll_10nm_pixel_clk_sel(pll_10nm); + if (IS_ERR(hw)) + return PTR_ERR(hw); + + hws[num++] = hw; + hw_data->hws[DP_PIXEL_CLK_SRC] = hw; + + pll_10nm->num_hws = num; + + hw_data->num = NUM_PROVIDED_CLKS; + pll_10nm->hw_data = hw_data; + + ret = of_clk_add_hw_provider(dev->of_node, of_clk_hw_onecell_get, + pll_10nm->hw_data); + if (ret) { + DRM_DEV_ERROR(dev, "failed to register clk provider: %d\n", ret); + return ret; + } + + return ret; +} + +struct msm_dp_pll *msm_dp_pll_10nm_init(struct platform_device *pdev, int id) +{ + struct dp_pll_10nm *dp_10nm_pll; + struct msm_dp_pll *pll; + int ret; + + if (!pdev) + return ERR_PTR(-ENODEV); + + dp_10nm_pll = devm_kzalloc(&pdev->dev, sizeof(*dp_10nm_pll), GFP_KERNEL); + if (!dp_10nm_pll) + return ERR_PTR(-ENOMEM); + + DBG("DP PLL%d", id); + + dp_10nm_pll->pdev = pdev; + dp_10nm_pll->id = id; + dp_pdb = dp_10nm_pll; + + dp_10nm_pll->pll_base = msm_ioremap(pdev, "pll_base", "DP_PLL"); + if (IS_ERR_OR_NULL(dp_10nm_pll->pll_base)) { + DRM_DEV_ERROR(&pdev->dev, "failed to map CMN PLL base\n"); + return ERR_PTR(-ENOMEM); + } + + dp_10nm_pll->phy_base = msm_ioremap(pdev, "phy_base", "DP_PHY"); + if (IS_ERR_OR_NULL(dp_10nm_pll->phy_base)) { + DRM_DEV_ERROR(&pdev->dev, "failed to map CMN PHY base\n"); + return ERR_PTR(-ENOMEM); + } + + dp_10nm_pll->ln_tx0_base = msm_ioremap(pdev, "ln_tx0_base", "DP_LN_TX0"); + if (IS_ERR_OR_NULL(dp_10nm_pll->ln_tx0_base)) { + DRM_DEV_ERROR(&pdev->dev, "failed to map CMN LN_TX0 base\n"); + return ERR_PTR(-ENOMEM); + } + + dp_10nm_pll->ln_tx1_base = msm_ioremap(pdev, "ln_tx1_base", "DP_LN_TX1"); + if (IS_ERR_OR_NULL(dp_10nm_pll->ln_tx1_base)) { + DRM_DEV_ERROR(&pdev->dev, "failed to map CMN LN_TX1 base\n"); + return ERR_PTR(-ENOMEM); + } + + ret = of_property_read_u32(pdev->dev.of_node, "cell-index", + &dp_10nm_pll->index); + if (ret) { + DRM_ERROR("Unable to get the cell-index ret=%d\n", ret); + dp_10nm_pll->index = 0; + } + + ret = msm_dp_pll_util_parse_dt_clock(pdev, &dp_10nm_pll->base); + if (ret) { + DRM_ERROR("Unable to parse dt clocks ret=%d\n", ret); + return ERR_PTR(ret); + } + + ret = dp_pll_10nm_register(dp_10nm_pll); + if (ret) { + DRM_DEV_ERROR(&pdev->dev, "failed to register PLL: %d\n", ret); + return ERR_PTR(ret); + } + + pll = &dp_10nm_pll->base; + pll->min_rate = DP_VCO_HSCLK_RATE_1620MHZDIV1000; + pll->max_rate = DP_VCO_HSCLK_RATE_8100MHZDIV1000; + pll->get_provider = dp_pll_10nm_get_provider; + + return pll; +} diff --git a/drivers/gpu/drm/msm/dp/pll/dp_pll_10nm.h b/drivers/gpu/drm/msm/dp/pll/dp_pll_10nm.h new file mode 100644 index 0000000..e2a5337 --- /dev/null +++ b/drivers/gpu/drm/msm/dp/pll/dp_pll_10nm.h @@ -0,0 +1,86 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved. + */ + +#ifndef __DP_PLL_10NM_H +#define __DP_PLL_10NM_H + +#include "dp_pll.h" +#include "dp_reg.h" + +#define DP_VCO_HSCLK_RATE_1620MHZDIV1000 1620000UL +#define DP_VCO_HSCLK_RATE_2700MHZDIV1000 2700000UL +#define DP_VCO_HSCLK_RATE_5400MHZDIV1000 5400000UL +#define DP_VCO_HSCLK_RATE_8100MHZDIV1000 8100000UL + +#define NUM_DP_CLOCKS_MAX 6 + +#define DP_PHY_PLL_POLL_SLEEP_US 500 +#define DP_PHY_PLL_POLL_TIMEOUT_US 10000 + +#define DP_VCO_RATE_8100MHZDIV1000 8100000UL +#define DP_VCO_RATE_9720MHZDIV1000 9720000UL +#define DP_VCO_RATE_10800MHZDIV1000 10800000UL + +struct dp_pll_10nm { + struct msm_dp_pll base; + + int id; + struct platform_device *pdev; + + void __iomem *pll_base; + void __iomem *phy_base; + void __iomem *ln_tx0_base; + void __iomem *ln_tx1_base; + + /* private clocks: */ + struct clk_hw *hws[NUM_DP_CLOCKS_MAX]; + u32 num_hws; + + /* clock-provider: */ + struct clk_hw_onecell_data *hw_data; + + /* lane and orientation settings */ + u8 lane_cnt; + u8 orientation; + + /* COM PHY settings */ + u32 hsclk_sel; + u32 dec_start_mode0; + u32 div_frac_start1_mode0; + u32 div_frac_start2_mode0; + u32 div_frac_start3_mode0; + u32 integloop_gain0_mode0; + u32 integloop_gain1_mode0; + u32 vco_tune_map; + u32 lock_cmp1_mode0; + u32 lock_cmp2_mode0; + u32 lock_cmp3_mode0; + u32 lock_cmp_en; + + /* PHY vco divider */ + u32 phy_vco_div; + /* + * Certain pll's needs to update the same vco rate after resume in + * suspend/resume scenario. Cached the vco rate for such plls. + */ + unsigned long vco_cached_rate; + u32 cached_cfg0; + u32 cached_cfg1; + u32 cached_outdiv; + + uint32_t index; +}; + +#define to_dp_pll_10nm(x) container_of(x, struct dp_pll_10nm, base) + +int dp_vco_set_rate_10nm(struct clk_hw *hw, unsigned long rate, + unsigned long parent_rate); +unsigned long dp_vco_recalc_rate_10nm(struct clk_hw *hw, + unsigned long parent_rate); +long dp_vco_round_rate_10nm(struct clk_hw *hw, unsigned long rate, + unsigned long *parent_rate); +int dp_vco_prepare_10nm(struct clk_hw *hw); +void dp_vco_unprepare_10nm(struct clk_hw *hw); +#endif /* __DP_PLL_10NM_H */ diff --git a/drivers/gpu/drm/msm/dp/pll/dp_pll_10nm_util.c b/drivers/gpu/drm/msm/dp/pll/dp_pll_10nm_util.c new file mode 100644 index 0000000..7026e5f --- /dev/null +++ b/drivers/gpu/drm/msm/dp/pll/dp_pll_10nm_util.c @@ -0,0 +1,522 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved. + */ + +#define pr_fmt(fmt) "%s: " fmt, __func__ + +#include <linux/kernel.h> +#include <linux/err.h> +#include <linux/iopoll.h> +#include <linux/delay.h> + +#include "dp_pll.h" +#include "dp_pll_10nm.h" +#include "dp_extcon.h" + +static int dp_vco_pll_init_db_10nm(struct msm_dp_pll *pll, + unsigned long rate) +{ + struct dp_pll_10nm *dp_res = to_dp_pll_10nm(pll); + u32 spare_value = 0; + + spare_value = PLL_REG_R(dp_res->phy_base, REG_DP_PHY_SPARE0); + dp_res->lane_cnt = spare_value & 0x0F; + dp_res->orientation = (spare_value & 0xF0) >> 4; + + DRM_DEBUG_DP("%s: spare_value=0x%x, ln_cnt=0x%x, orientation=0x%x\n", + __func__, spare_value, dp_res->lane_cnt, dp_res->orientation); + + switch (rate) { + case DP_VCO_HSCLK_RATE_1620MHZDIV1000: + DRM_DEBUG_DP("%s: VCO rate: %ld\n", __func__, + DP_VCO_RATE_9720MHZDIV1000); + dp_res->hsclk_sel = 0x0c; + dp_res->dec_start_mode0 = 0x69; + dp_res->div_frac_start1_mode0 = 0x00; + dp_res->div_frac_start2_mode0 = 0x80; + dp_res->div_frac_start3_mode0 = 0x07; + dp_res->integloop_gain0_mode0 = 0x3f; + dp_res->integloop_gain1_mode0 = 0x00; + dp_res->vco_tune_map = 0x00; + dp_res->lock_cmp1_mode0 = 0x6f; + dp_res->lock_cmp2_mode0 = 0x08; + dp_res->lock_cmp3_mode0 = 0x00; + dp_res->phy_vco_div = 0x1; + dp_res->lock_cmp_en = 0x00; + break; + case DP_VCO_HSCLK_RATE_2700MHZDIV1000: + DRM_DEBUG_DP("%s: VCO rate: %ld\n", __func__, + DP_VCO_RATE_10800MHZDIV1000); + dp_res->hsclk_sel = 0x04; + dp_res->dec_start_mode0 = 0x69; + dp_res->div_frac_start1_mode0 = 0x00; + dp_res->div_frac_start2_mode0 = 0x80; + dp_res->div_frac_start3_mode0 = 0x07; + dp_res->integloop_gain0_mode0 = 0x3f; + dp_res->integloop_gain1_mode0 = 0x00; + dp_res->vco_tune_map = 0x00; + dp_res->lock_cmp1_mode0 = 0x0f; + dp_res->lock_cmp2_mode0 = 0x0e; + dp_res->lock_cmp3_mode0 = 0x00; + dp_res->phy_vco_div = 0x1; + dp_res->lock_cmp_en = 0x00; + break; + case DP_VCO_HSCLK_RATE_5400MHZDIV1000: + DRM_DEBUG_DP("%s: VCO rate: %ld\n", __func__, + DP_VCO_RATE_10800MHZDIV1000); + dp_res->hsclk_sel = 0x00; + dp_res->dec_start_mode0 = 0x8c; + dp_res->div_frac_start1_mode0 = 0x00; + dp_res->div_frac_start2_mode0 = 0x00; + dp_res->div_frac_start3_mode0 = 0x0a; + dp_res->integloop_gain0_mode0 = 0x3f; + dp_res->integloop_gain1_mode0 = 0x00; + dp_res->vco_tune_map = 0x00; + dp_res->lock_cmp1_mode0 = 0x1f; + dp_res->lock_cmp2_mode0 = 0x1c; + dp_res->lock_cmp3_mode0 = 0x00; + dp_res->phy_vco_div = 0x2; + dp_res->lock_cmp_en = 0x00; + break; + case DP_VCO_HSCLK_RATE_8100MHZDIV1000: + DRM_DEBUG_DP("%s: VCO rate: %ld\n", __func__, + DP_VCO_RATE_8100MHZDIV1000); + dp_res->hsclk_sel = 0x03; + dp_res->dec_start_mode0 = 0x69; + dp_res->div_frac_start1_mode0 = 0x00; + dp_res->div_frac_start2_mode0 = 0x80; + dp_res->div_frac_start3_mode0 = 0x07; + dp_res->integloop_gain0_mode0 = 0x3f; + dp_res->integloop_gain1_mode0 = 0x00; + dp_res->vco_tune_map = 0x00; + dp_res->lock_cmp1_mode0 = 0x2f; + dp_res->lock_cmp2_mode0 = 0x2a; + dp_res->lock_cmp3_mode0 = 0x00; + dp_res->phy_vco_div = 0x0; + dp_res->lock_cmp_en = 0x08; + break; + default: + return -EINVAL; + } + return 0; +} + +static int dp_config_vco_rate_10nm(struct msm_dp_pll *pll, + unsigned long rate) +{ + u32 res = 0; + struct dp_pll_10nm *dp_res = to_dp_pll_10nm(pll); + + res = dp_vco_pll_init_db_10nm(pll, rate); + if (res) { + DRM_ERROR("VCO Init DB failed\n"); + return res; + } + + if (dp_res->lane_cnt != 4) { + if (dp_res->orientation == ORIENTATION_CC2) + PLL_REG_W(dp_res->phy_base, REG_DP_PHY_PD_CTL, 0x6d); + else + PLL_REG_W(dp_res->phy_base, REG_DP_PHY_PD_CTL, 0x75); + } else { + PLL_REG_W(dp_res->phy_base, REG_DP_PHY_PD_CTL, 0x7d); + } + + /* Make sure the PHY register writes are done */ + wmb(); + + PLL_REG_W(dp_res->pll_base, QSERDES_COM_SVS_MODE_CLK_SEL, 0x01); + PLL_REG_W(dp_res->pll_base, QSERDES_COM_SYSCLK_EN_SEL, 0x37); + PLL_REG_W(dp_res->pll_base, QSERDES_COM_SYS_CLK_CTRL, 0x02); + PLL_REG_W(dp_res->pll_base, QSERDES_COM_CLK_ENABLE1, 0x0e); + PLL_REG_W(dp_res->pll_base, QSERDES_COM_SYSCLK_BUF_ENABLE, 0x06); + PLL_REG_W(dp_res->pll_base, QSERDES_COM_CLK_SEL, 0x30); + PLL_REG_W(dp_res->pll_base, QSERDES_COM_CMN_CONFIG, 0x02); + + /* Different for each clock rates */ + PLL_REG_W(dp_res->pll_base, + QSERDES_COM_HSCLK_SEL, dp_res->hsclk_sel); + PLL_REG_W(dp_res->pll_base, + QSERDES_COM_DEC_START_MODE0, dp_res->dec_start_mode0); + PLL_REG_W(dp_res->pll_base, + QSERDES_COM_DIV_FRAC_START1_MODE0, dp_res->div_frac_start1_mode0); + PLL_REG_W(dp_res->pll_base, + QSERDES_COM_DIV_FRAC_START2_MODE0, dp_res->div_frac_start2_mode0); + PLL_REG_W(dp_res->pll_base, + QSERDES_COM_DIV_FRAC_START3_MODE0, dp_res->div_frac_start3_mode0); + PLL_REG_W(dp_res->pll_base, + QSERDES_COM_INTEGLOOP_GAIN0_MODE0, dp_res->integloop_gain0_mode0); + PLL_REG_W(dp_res->pll_base, + QSERDES_COM_INTEGLOOP_GAIN1_MODE0, dp_res->integloop_gain1_mode0); + PLL_REG_W(dp_res->pll_base, + QSERDES_COM_VCO_TUNE_MAP, dp_res->vco_tune_map); + PLL_REG_W(dp_res->pll_base, + QSERDES_COM_LOCK_CMP1_MODE0, dp_res->lock_cmp1_mode0); + PLL_REG_W(dp_res->pll_base, + QSERDES_COM_LOCK_CMP2_MODE0, dp_res->lock_cmp2_mode0); + PLL_REG_W(dp_res->pll_base, + QSERDES_COM_LOCK_CMP3_MODE0, dp_res->lock_cmp3_mode0); + /* Make sure the PLL register writes are done */ + wmb(); + + PLL_REG_W(dp_res->pll_base, QSERDES_COM_BG_TIMER, 0x0a); + PLL_REG_W(dp_res->pll_base, QSERDES_COM_CORECLK_DIV_MODE0, 0x0a); + PLL_REG_W(dp_res->pll_base, QSERDES_COM_VCO_TUNE_CTRL, 0x00); + PLL_REG_W(dp_res->pll_base, QSERDES_COM_BIAS_EN_CLKBUFLR_EN, 0x3f); + PLL_REG_W(dp_res->pll_base, QSERDES_COM_CORE_CLK_EN, 0x1f); + PLL_REG_W(dp_res->pll_base, QSERDES_COM_PLL_IVCO, 0x07); + PLL_REG_W(dp_res->pll_base, + QSERDES_COM_LOCK_CMP_EN, dp_res->lock_cmp_en); + PLL_REG_W(dp_res->pll_base, QSERDES_COM_PLL_CCTRL_MODE0, 0x36); + PLL_REG_W(dp_res->pll_base, QSERDES_COM_PLL_RCTRL_MODE0, 0x16); + PLL_REG_W(dp_res->pll_base, QSERDES_COM_CP_CTRL_MODE0, 0x06); + /* Make sure the PHY register writes are done */ + wmb(); + + if (dp_res->orientation == ORIENTATION_CC2) + PLL_REG_W(dp_res->phy_base, REG_DP_PHY_MODE, 0x4c); + else + PLL_REG_W(dp_res->phy_base, REG_DP_PHY_MODE, 0x5c); + /* Make sure the PLL register writes are done */ + wmb(); + + /* TX Lane configuration */ + PLL_REG_W(dp_res->phy_base, + REG_DP_PHY_TX0_TX1_LANE_CTL, 0x05); + PLL_REG_W(dp_res->phy_base, + REG_DP_PHY_TX2_TX3_LANE_CTL, 0x05); + + /* TX-0 register configuration */ + PLL_REG_W(dp_res->ln_tx0_base, TXn_TRANSCEIVER_BIAS_EN, 0x1a); + PLL_REG_W(dp_res->ln_tx0_base, TXn_VMODE_CTRL1, 0x40); + PLL_REG_W(dp_res->ln_tx0_base, TXn_PRE_STALL_LDO_BOOST_EN, 0x30); + PLL_REG_W(dp_res->ln_tx0_base, TXn_INTERFACE_SELECT, 0x3d); + PLL_REG_W(dp_res->ln_tx0_base, TXn_CLKBUF_ENABLE, 0x0f); + PLL_REG_W(dp_res->ln_tx0_base, TXn_RESET_TSYNC_EN, 0x03); + PLL_REG_W(dp_res->ln_tx0_base, TXn_TRAN_DRVR_EMP_EN, 0x03); + PLL_REG_W(dp_res->ln_tx0_base, + TXn_PARRATE_REC_DETECT_IDLE_EN, 0x00); + PLL_REG_W(dp_res->ln_tx0_base, TXn_TX_INTERFACE_MODE, 0x00); + PLL_REG_W(dp_res->ln_tx0_base, TXn_TX_BAND, 0x4); + + /* TX-1 register configuration */ + PLL_REG_W(dp_res->ln_tx1_base, TXn_TRANSCEIVER_BIAS_EN, 0x1a); + PLL_REG_W(dp_res->ln_tx1_base, TXn_VMODE_CTRL1, 0x40); + PLL_REG_W(dp_res->ln_tx1_base, TXn_PRE_STALL_LDO_BOOST_EN, 0x30); + PLL_REG_W(dp_res->ln_tx1_base, TXn_INTERFACE_SELECT, 0x3d); + PLL_REG_W(dp_res->ln_tx1_base, TXn_CLKBUF_ENABLE, 0x0f); + PLL_REG_W(dp_res->ln_tx1_base, TXn_RESET_TSYNC_EN, 0x03); + PLL_REG_W(dp_res->ln_tx1_base, TXn_TRAN_DRVR_EMP_EN, 0x03); + PLL_REG_W(dp_res->ln_tx1_base, + TXn_PARRATE_REC_DETECT_IDLE_EN, 0x00); + PLL_REG_W(dp_res->ln_tx1_base, TXn_TX_INTERFACE_MODE, 0x00); + PLL_REG_W(dp_res->ln_tx1_base, TXn_TX_BAND, 0x4); + /* Make sure the PHY register writes are done */ + wmb(); + + /* dependent on the vco frequency */ + PLL_REG_W(dp_res->phy_base, REG_DP_PHY_VCO_DIV, dp_res->phy_vco_div); + + return res; +} + +static bool dp_10nm_pll_lock_status(struct dp_pll_10nm *dp_res) +{ + u32 status; + bool pll_locked; + + /* poll for PLL lock status */ + if (readl_poll_timeout_atomic((dp_res->pll_base + + QSERDES_COM_C_READY_STATUS), + status, + ((status & BIT(0)) > 0), + DP_PHY_PLL_POLL_SLEEP_US, + DP_PHY_PLL_POLL_TIMEOUT_US)) { + DRM_ERROR("%s: C_READY status is not high. Status=%x\n", + __func__, status); + pll_locked = false; + } else { + pll_locked = true; + } + + return pll_locked; +} + +static bool dp_10nm_phy_rdy_status(struct dp_pll_10nm *dp_res) +{ + u32 status; + bool phy_ready = true; + + /* poll for PHY ready status */ + if (readl_poll_timeout_atomic((dp_res->phy_base + + REG_DP_PHY_STATUS), + status, + ((status & (BIT(1))) > 0), + DP_PHY_PLL_POLL_SLEEP_US, + DP_PHY_PLL_POLL_TIMEOUT_US)) { + DRM_ERROR("%s: Phy_ready is not high. Status=%x\n", + __func__, status); + phy_ready = false; + } + + return phy_ready; +} + +static int dp_pll_enable_10nm(struct clk_hw *hw) +{ + int rc = 0; + struct msm_dp_pll *pll = hw_clk_to_pll(hw); + struct dp_pll_10nm *dp_res = to_dp_pll_10nm(pll); + u32 bias_en, drvr_en; + + PLL_REG_W(dp_res->phy_base, REG_DP_PHY_AUX_CFG2, 0x04); + PLL_REG_W(dp_res->phy_base, REG_DP_PHY_CFG, 0x01); + PLL_REG_W(dp_res->phy_base, REG_DP_PHY_CFG, 0x05); + PLL_REG_W(dp_res->phy_base, REG_DP_PHY_CFG, 0x01); + PLL_REG_W(dp_res->phy_base, REG_DP_PHY_CFG, 0x09); + wmb(); /* Make sure the PHY register writes are done */ + + PLL_REG_W(dp_res->pll_base, QSERDES_COM_RESETSM_CNTRL, 0x20); + wmb(); /* Make sure the PLL register writes are done */ + + if (!dp_10nm_pll_lock_status(dp_res)) { + rc = -EINVAL; + goto lock_err; + } + + PLL_REG_W(dp_res->phy_base, REG_DP_PHY_CFG, 0x19); + /* Make sure the PHY register writes are done */ + wmb(); + /* poll for PHY ready status */ + if (!dp_10nm_phy_rdy_status(dp_res)) { + rc = -EINVAL; + goto lock_err; + } + + DRM_DEBUG_DP("%s: PLL is locked\n", __func__); + + if (dp_res->lane_cnt == 1) { + bias_en = 0x3e; + drvr_en = 0x13; + } else { + bias_en = 0x3f; + drvr_en = 0x10; + } + + if (dp_res->lane_cnt != 4) { + if (dp_res->orientation == ORIENTATION_CC1) { + PLL_REG_W(dp_res->ln_tx1_base, + TXn_HIGHZ_DRVR_EN, drvr_en); + PLL_REG_W(dp_res->ln_tx1_base, + TXn_TRANSCEIVER_BIAS_EN, bias_en); + } else { + PLL_REG_W(dp_res->ln_tx0_base, + TXn_HIGHZ_DRVR_EN, drvr_en); + PLL_REG_W(dp_res->ln_tx0_base, + TXn_TRANSCEIVER_BIAS_EN, bias_en); + } + } else { + PLL_REG_W(dp_res->ln_tx0_base, TXn_HIGHZ_DRVR_EN, drvr_en); + PLL_REG_W(dp_res->ln_tx0_base, + TXn_TRANSCEIVER_BIAS_EN, bias_en); + PLL_REG_W(dp_res->ln_tx1_base, TXn_HIGHZ_DRVR_EN, drvr_en); + PLL_REG_W(dp_res->ln_tx1_base, + TXn_TRANSCEIVER_BIAS_EN, bias_en); + } + + PLL_REG_W(dp_res->ln_tx0_base, TXn_TX_POL_INV, 0x0a); + PLL_REG_W(dp_res->ln_tx1_base, TXn_TX_POL_INV, 0x0a); + PLL_REG_W(dp_res->phy_base, REG_DP_PHY_CFG, 0x18); + udelay(2000); + + PLL_REG_W(dp_res->phy_base, REG_DP_PHY_CFG, 0x19); + + /* + * Make sure all the register writes are completed before + * doing any other operation + */ + wmb(); + + /* poll for PHY ready status */ + if (!dp_10nm_phy_rdy_status(dp_res)) { + rc = -EINVAL; + goto lock_err; + } + + PLL_REG_W(dp_res->ln_tx0_base, TXn_TX_DRV_LVL, 0x38); + PLL_REG_W(dp_res->ln_tx1_base, TXn_TX_DRV_LVL, 0x38); + PLL_REG_W(dp_res->ln_tx0_base, TXn_TX_EMP_POST1_LVL, 0x20); + PLL_REG_W(dp_res->ln_tx1_base, TXn_TX_EMP_POST1_LVL, 0x20); + PLL_REG_W(dp_res->ln_tx0_base, TXn_RES_CODE_LANE_OFFSET_TX, 0x06); + PLL_REG_W(dp_res->ln_tx1_base, TXn_RES_CODE_LANE_OFFSET_TX, 0x06); + PLL_REG_W(dp_res->ln_tx0_base, TXn_RES_CODE_LANE_OFFSET_RX, 0x07); + PLL_REG_W(dp_res->ln_tx1_base, TXn_RES_CODE_LANE_OFFSET_RX, 0x07); + /* Make sure the PHY register writes are done */ + wmb(); + +lock_err: + return rc; +} + +static int dp_pll_disable_10nm(struct clk_hw *hw) +{ + int rc = 0; + struct msm_dp_pll *pll = hw_clk_to_pll(hw); + struct dp_pll_10nm *dp_res = to_dp_pll_10nm(pll); + + /* Assert DP PHY power down */ + PLL_REG_W(dp_res->phy_base, REG_DP_PHY_PD_CTL, 0x2); + /* + * Make sure all the register writes to disable PLL are + * completed before doing any other operation + */ + wmb(); + + return rc; +} + + +int dp_vco_prepare_10nm(struct clk_hw *hw) +{ + int rc = 0; + struct msm_dp_pll *pll = hw_clk_to_pll(hw); + struct dp_pll_10nm *dp_res = to_dp_pll_10nm(pll); + + DRM_DEBUG_DP("%s: rate = %ld\n", __func__, pll->rate); + if ((dp_res->vco_cached_rate != 0) + && (dp_res->vco_cached_rate == pll->rate)) { + rc = dp_vco_set_rate_10nm(hw, + dp_res->vco_cached_rate, dp_res->vco_cached_rate); + if (rc) { + DRM_ERROR("index=%d vco_set_rate failed. rc=%d\n", + rc, dp_res->index); + goto error; + } + } + + rc = dp_pll_enable_10nm(hw); + if (rc) { + DRM_ERROR("ndx=%d failed to enable dp pll\n", + dp_res->index); + goto error; + } + + pll->pll_on = true; +error: + return rc; +} + +void dp_vco_unprepare_10nm(struct clk_hw *hw) +{ + struct msm_dp_pll *pll = hw_clk_to_pll(hw); + struct dp_pll_10nm *dp_res = to_dp_pll_10nm(pll); + + if (!dp_res) { + DRM_ERROR("Invalid input parameter\n"); + return; + } + + if (!pll->pll_on) { + DRM_ERROR("pll resource can't be enabled\n"); + return; + } + dp_res->vco_cached_rate = pll->rate; + dp_pll_disable_10nm(hw); + + pll->pll_on = false; +} + +int dp_vco_set_rate_10nm(struct clk_hw *hw, unsigned long rate, + unsigned long parent_rate) +{ + struct msm_dp_pll *pll = hw_clk_to_pll(hw); + int rc; + + DRM_DEBUG_DP("DP lane CLK rate=%ld\n", rate); + + rc = dp_config_vco_rate_10nm(pll, rate); + if (rc) + DRM_ERROR("%s: Failed to set clk rate\n", __func__); + + pll->rate = rate; + + return 0; +} + +unsigned long dp_vco_recalc_rate_10nm(struct clk_hw *hw, + unsigned long parent_rate) +{ + struct msm_dp_pll *pll = hw_clk_to_pll(hw); + struct dp_pll_10nm *dp_res = to_dp_pll_10nm(pll); + u32 div, hsclk_div, link_clk_div = 0; + u64 vco_rate; + + div = PLL_REG_R(dp_res->pll_base, QSERDES_COM_HSCLK_SEL); + div &= 0x0f; + + if (div == 12) + hsclk_div = 6; /* Default */ + else if (div == 4) + hsclk_div = 4; + else if (div == 0) + hsclk_div = 2; + else if (div == 3) + hsclk_div = 1; + else { + DRM_DEBUG_DP("unknown divider. forcing to default\n"); + hsclk_div = 5; + } + + div = PLL_REG_R(dp_res->phy_base, REG_DP_PHY_AUX_CFG2); + div >>= 2; + + if ((div & 0x3) == 0) + link_clk_div = 5; + else if ((div & 0x3) == 1) + link_clk_div = 10; + else if ((div & 0x3) == 2) + link_clk_div = 20; + else + DRM_ERROR("%s: unsupported div. Phy_mode: %d\n", __func__, div); + + if (link_clk_div == 20) { + vco_rate = DP_VCO_HSCLK_RATE_2700MHZDIV1000; + } else { + if (hsclk_div == 6) + vco_rate = DP_VCO_HSCLK_RATE_1620MHZDIV1000; + else if (hsclk_div == 4) + vco_rate = DP_VCO_HSCLK_RATE_2700MHZDIV1000; + else if (hsclk_div == 2) + vco_rate = DP_VCO_HSCLK_RATE_5400MHZDIV1000; + else + vco_rate = DP_VCO_HSCLK_RATE_8100MHZDIV1000; + } + + DRM_DEBUG_DP("returning vco rate = %lu\n", (unsigned long)vco_rate); + + dp_res->vco_cached_rate = pll->rate = vco_rate; + return (unsigned long)vco_rate; +} + +long dp_vco_round_rate_10nm(struct clk_hw *hw, unsigned long rate, + unsigned long *parent_rate) +{ + unsigned long rrate = rate; + struct msm_dp_pll *pll = hw_clk_to_pll(hw); + + if (rate <= pll->min_rate) + rrate = pll->min_rate; + else if (rate <= DP_VCO_HSCLK_RATE_2700MHZDIV1000) + rrate = DP_VCO_HSCLK_RATE_2700MHZDIV1000; + else if (rate <= DP_VCO_HSCLK_RATE_5400MHZDIV1000) + rrate = DP_VCO_HSCLK_RATE_5400MHZDIV1000; + else + rrate = pll->max_rate; + + DRM_DEBUG_DP("%s: rrate=%ld\n", __func__, rrate); + + *parent_rate = rrate; + return rrate; +} +
Add the needed DP PLL specific files to support display port interface on msm targets. The DP driver calls the DP PLL driver registration. The DP driver sets the link and pixel clock sources. Changes in v2: -- Update copyright markings on all relevant files. -- Use DRM_DEBUG_DP for debug msgs. Signed-off-by: Chandan Uddaraju <chandanu@codeaurora.org> --- drivers/gpu/drm/msm/Kconfig | 15 + drivers/gpu/drm/msm/Makefile | 6 + drivers/gpu/drm/msm/dp/dp_display.c | 50 +++ drivers/gpu/drm/msm/dp/dp_display.h | 3 + drivers/gpu/drm/msm/dp/dp_parser.h | 3 + drivers/gpu/drm/msm/dp/dp_power.h | 1 + drivers/gpu/drm/msm/dp/pll/dp_pll.c | 145 +++++++ drivers/gpu/drm/msm/dp/pll/dp_pll.h | 56 +++ drivers/gpu/drm/msm/dp/pll/dp_pll_10nm.c | 393 +++++++++++++++++++ drivers/gpu/drm/msm/dp/pll/dp_pll_10nm.h | 86 +++++ drivers/gpu/drm/msm/dp/pll/dp_pll_10nm_util.c | 522 ++++++++++++++++++++++++++ 11 files changed, 1280 insertions(+) create mode 100644 drivers/gpu/drm/msm/dp/pll/dp_pll.c create mode 100644 drivers/gpu/drm/msm/dp/pll/dp_pll.h create mode 100644 drivers/gpu/drm/msm/dp/pll/dp_pll_10nm.c create mode 100644 drivers/gpu/drm/msm/dp/pll/dp_pll_10nm.h create mode 100644 drivers/gpu/drm/msm/dp/pll/dp_pll_10nm_util.c