[PATCH v2 2/3] drm/msm/dsi: add implementation for helper functions
Sibi S
sibis at codeaurora.org
Mon Mar 26 17:16:28 UTC 2018
Hi Jordan,
Thanks for the review.
On 03/20/2018 01:53 AM, Jordan Crouse wrote:
> On Tue, Mar 20, 2018 at 01:11:02AM +0530, Sibi S wrote:
>> Add dsi host helper function implementation for DSI v2
>> DSI 6G 1.x and DSI 6G v2.0+ controllers
>>
>> Signed-off-by: Sibi S <sibis at codeaurora.org>
>> ---
>> drivers/gpu/drm/msm/dsi/dsi.h | 15 +++
>> drivers/gpu/drm/msm/dsi/dsi_cfg.c | 56 +++++++--
>> drivers/gpu/drm/msm/dsi/dsi_host.c | 236 ++++++++++++++++++++++++++++++++++++-
>> 3 files changed, 296 insertions(+), 11 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/msm/dsi/dsi.h b/drivers/gpu/drm/msm/dsi/dsi.h
>> index 80be83e8fdec..dfa049d876bd 100644
>> --- a/drivers/gpu/drm/msm/dsi/dsi.h
>> +++ b/drivers/gpu/drm/msm/dsi/dsi.h
>> @@ -183,6 +183,21 @@ int msm_dsi_host_modeset_init(struct mipi_dsi_host *host,
>> int msm_dsi_host_init(struct msm_dsi *msm_dsi);
>> int msm_dsi_runtime_suspend(struct device *dev);
>> int msm_dsi_runtime_resume(struct device *dev);
>> +int dsi_link_clk_enable_6g(struct msm_dsi_host *msm_host);
>> +int dsi_link_clk_enable_v2(struct msm_dsi_host *msm_host);
>> +void dsi_link_clk_disable_6g(struct msm_dsi_host *msm_host);
>> +void dsi_link_clk_disable_v2(struct msm_dsi_host *msm_host);
>> +int dsi_tx_buf_alloc_6g(struct msm_dsi_host *msm_host, int size);
>> +int dsi_tx_buf_alloc_v2(struct msm_dsi_host *msm_host, int size);
>> +void *dsi_tx_buf_get_6g(struct msm_dsi_host *msm_host);
>> +void *dsi_tx_buf_get_v2(struct msm_dsi_host *msm_host);
>> +void dsi_tx_buf_put_6g(struct msm_dsi_host *msm_host);
>> +int dsi_dma_base_get_6g(struct msm_dsi_host *msm_host, uint64_t *iova);
>> +int dsi_dma_base_get_v2(struct msm_dsi_host *msm_host, uint64_t *iova);
>> +int dsi_clk_init_v2(struct msm_dsi_host *msm_host);
>> +int dsi_clk_init_6g_v2(struct msm_dsi_host *msm_host);
>> +int dsi_calc_clk_rate_v2(struct msm_dsi_host *msm_host);
>> +int dsi_calc_clk_rate_6g(struct msm_dsi_host *msm_host);
>>
>> /* dsi phy */
>> struct msm_dsi_phy;
>> diff --git a/drivers/gpu/drm/msm/dsi/dsi_cfg.c b/drivers/gpu/drm/msm/dsi/dsi_cfg.c
>> index 0327bb54b01b..dcdfb1bb54f9 100644
>> --- a/drivers/gpu/drm/msm/dsi/dsi_cfg.c
>> +++ b/drivers/gpu/drm/msm/dsi/dsi_cfg.c
>> @@ -136,20 +136,58 @@ static const struct msm_dsi_config sdm845_dsi_cfg = {
>> .num_dsi = 2,
>> };
>>
>> +const static struct msm_dsi_host_cfg_ops msm_dsi_v2_host_ops = {
>> + .link_clk_enable = dsi_link_clk_enable_v2,
>> + .link_clk_disable = dsi_link_clk_disable_v2,
>> + .clk_init_ver = dsi_clk_init_v2,
>> + .tx_buf_alloc = dsi_tx_buf_alloc_v2,
>> + .tx_buf_get = dsi_tx_buf_get_v2,
>> + .tx_buf_put = NULL,
>> + .dma_base_get = dsi_dma_base_get_v2,
>> + .calc_clk_rate = dsi_calc_clk_rate_v2,
>> +};
>> +
>> +const static struct msm_dsi_host_cfg_ops msm_dsi_6g_host_ops = {
>> + .link_clk_enable = dsi_link_clk_enable_6g,
>> + .link_clk_disable = dsi_link_clk_disable_6g,
>> + .clk_init_ver = NULL,
>> + .tx_buf_alloc = dsi_tx_buf_alloc_6g,
>> + .tx_buf_get = dsi_tx_buf_get_6g,
>> + .tx_buf_put = dsi_tx_buf_put_6g,
>> + .dma_base_get = dsi_dma_base_get_6g,
>> + .calc_clk_rate = dsi_calc_clk_rate_6g,
>> +};
>> +
>> +const static struct msm_dsi_host_cfg_ops msm_dsi_6g_v2_host_ops = {
>> + .link_clk_enable = dsi_link_clk_enable_6g,
>> + .link_clk_disable = dsi_link_clk_disable_6g,
>> + .clk_init_ver = dsi_clk_init_6g_v2,
>> + .tx_buf_alloc = dsi_tx_buf_alloc_6g,
>> + .tx_buf_get = dsi_tx_buf_get_6g,
>> + .tx_buf_put = dsi_tx_buf_put_6g,
>> + .dma_base_get = dsi_dma_base_get_6g,
>> + .calc_clk_rate = dsi_calc_clk_rate_6g,
>> +};
>> +
>> static const struct msm_dsi_cfg_handler dsi_cfg_handlers[] = {
>> - {MSM_DSI_VER_MAJOR_V2, MSM_DSI_V2_VER_MINOR_8064, &apq8064_dsi_cfg},
>> + {MSM_DSI_VER_MAJOR_V2, MSM_DSI_V2_VER_MINOR_8064,
>> + &apq8064_dsi_cfg, &msm_dsi_v2_host_ops},
>> {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V1_0,
>> - &msm8974_apq8084_dsi_cfg},
>> + &msm8974_apq8084_dsi_cfg, &msm_dsi_6g_host_ops},
>> {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V1_1,
>> - &msm8974_apq8084_dsi_cfg},
>> + &msm8974_apq8084_dsi_cfg, &msm_dsi_6g_host_ops},
>> {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V1_1_1,
>> - &msm8974_apq8084_dsi_cfg},
>> + &msm8974_apq8084_dsi_cfg, &msm_dsi_6g_host_ops},
>> {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V1_2,
>> - &msm8974_apq8084_dsi_cfg},
>> - {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V1_3, &msm8994_dsi_cfg},
>> - {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V1_3_1, &msm8916_dsi_cfg},
>> - {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V1_4_1, &msm8996_dsi_cfg},
>> - {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V2_2_1, &sdm845_dsi_cfg},
>> + &msm8974_apq8084_dsi_cfg, &msm_dsi_6g_host_ops},
>> + {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V1_3,
>> + &msm8994_dsi_cfg, &msm_dsi_6g_host_ops},
>> + {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V1_3_1,
>> + &msm8916_dsi_cfg, &msm_dsi_6g_host_ops},
>> + {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V1_4_1,
>> + &msm8996_dsi_cfg, &msm_dsi_6g_host_ops},
>> + {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V2_2_1,
>> + &sdm845_dsi_cfg, &msm_dsi_6g_v2_host_ops},
>> };
>>
>> const struct msm_dsi_cfg_handler *msm_dsi_cfg_get(u32 major, u32 minor)
>> diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c
>> index 7a03a9489708..78ea4540f0ee 100644
>> --- a/drivers/gpu/drm/msm/dsi/dsi_host.c
>> +++ b/drivers/gpu/drm/msm/dsi/dsi_host.c
>> @@ -331,6 +331,54 @@ static int dsi_regulator_init(struct msm_dsi_host *msm_host)
>> return 0;
>> }
>>
>> +int dsi_clk_init_v2(struct msm_dsi_host *msm_host)
>> +{
>> + struct platform_device *pdev = msm_host->pdev;
>> + int ret = 0;
>> +
>> + msm_host->src_clk = msm_clk_get(pdev, "src");
>> +
>> + if (IS_ERR(msm_host->src_clk)) {
>> + ret = PTR_ERR(msm_host->src_clk);
>> + pr_err("%s: can't find src clock. ret=%d\n",
>> + __func__, ret);
>> + msm_host->src_clk = NULL;
>> + return ret;
>> + }
>> +
>> + msm_host->esc_clk_src = clk_get_parent(msm_host->esc_clk);
>> + if (!msm_host->esc_clk_src) {
>> + ret = -ENODEV;
>> + pr_err("%s: can't get esc clock parent. ret=%d\n",
>> + __func__, ret);
>> + return ret;
>> + }
>> +
>> + msm_host->dsi_clk_src = clk_get_parent(msm_host->src_clk);
>> + if (!msm_host->dsi_clk_src) {
>> + ret = -ENODEV;
>> + pr_err("%s: can't get src clock parent. ret=%d\n",
>> + __func__, ret);
>> + }
>> +
>> + return ret;
>> +}
>> +
>> +int dsi_clk_init_6g_v2(struct msm_dsi_host *msm_host)
>> +{
>> + struct platform_device *pdev = msm_host->pdev;
>> + int ret = 0;
>> +
>> + msm_host->byte_intf_clk = msm_clk_get(pdev, "byte_intf");
>> + if (IS_ERR(msm_host->byte_intf_clk)) {
>> + ret = PTR_ERR(msm_host->byte_intf_clk);
>> + pr_err("%s: can't find byte_intf clock. ret=%d\n",
>> + __func__, ret);
>> + }
>> +
>> + return ret;
>> +}
>> +
>> static int dsi_clk_init(struct msm_dsi_host *msm_host)
>> {
>> struct platform_device *pdev = msm_host->pdev;
>> @@ -497,7 +545,7 @@ int msm_dsi_runtime_resume(struct device *dev)
>> return dsi_bus_clk_enable(msm_host);
>> }
>>
>> -static int dsi_link_clk_enable_6g(struct msm_dsi_host *msm_host)
>> +int dsi_link_clk_enable_6g(struct msm_dsi_host *msm_host)
>> {
>> int ret;
>>
>> @@ -565,7 +613,7 @@ static int dsi_link_clk_enable_6g(struct msm_dsi_host *msm_host)
>> return ret;
>> }
>>
>> -static int dsi_link_clk_enable_v2(struct msm_dsi_host *msm_host)
>> +int dsi_link_clk_enable_v2(struct msm_dsi_host *msm_host)
>> {
>> int ret;
>>
>> @@ -643,6 +691,23 @@ static int dsi_link_clk_enable(struct msm_dsi_host *msm_host)
>> return dsi_link_clk_enable_v2(msm_host);
>> }
>>
>> +void dsi_link_clk_disable_6g(struct msm_dsi_host *msm_host)
>> +{
>> + clk_disable_unprepare(msm_host->esc_clk);
>> + clk_disable_unprepare(msm_host->pixel_clk);
>> + if (msm_host->byte_intf_clk)
>> + clk_disable_unprepare(msm_host->byte_intf_clk);
>> + clk_disable_unprepare(msm_host->byte_clk);
>> +}
>> +
>> +void dsi_link_clk_disable_v2(struct msm_dsi_host *msm_host)
>> +{
>> + clk_disable_unprepare(msm_host->pixel_clk);
>> + clk_disable_unprepare(msm_host->src_clk);
>> + clk_disable_unprepare(msm_host->esc_clk);
>> + clk_disable_unprepare(msm_host->byte_clk);
>> +}
>> +
>> static void dsi_link_clk_disable(struct msm_dsi_host *msm_host)
>> {
>> const struct msm_dsi_cfg_handler *cfg_hnd = msm_host->cfg_hnd;
>> @@ -661,6 +726,94 @@ static void dsi_link_clk_disable(struct msm_dsi_host *msm_host)
>> }
>> }
>>
>> +int dsi_calc_clk_rate_6g(struct msm_dsi_host *msm_host)
>> +{
>> + struct drm_display_mode *mode = msm_host->mode;
>> + u8 lanes = msm_host->lanes;
>> + u32 bpp = dsi_get_bpp(msm_host->format);
>> + u32 pclk_rate;
>> +
>> + if (!mode) {
>> + pr_err("%s: mode not set\n", __func__);
>> + return -EINVAL;
>> + }
>
> As far as I can tell from patch 3/3 the calc_clk_rate() function hook is only
> called once and mode_host is guaranteed to be not null. I don't think this check
> is needed.
yes should work fine
>
>> + pclk_rate = mode->clock * 1000;
>> + if (lanes > 0) {
>> + msm_host->byte_clk_rate = (pclk_rate * bpp) / (8 * lanes);
>> + } else {
>> + pr_err("%s: forcing mdss_dsi lanes to 1\n", __func__);
>> + msm_host->byte_clk_rate = (pclk_rate * bpp) / 8;
>> + }
>> +
>> + DBG("pclk=%d, bclk=%d", pclk_rate, msm_host->byte_clk_rate);
>> +
>> + msm_host->esc_clk_rate = clk_get_rate(msm_host->esc_clk);
>> +
>> + return 0;
>> +}
>> +
>> +int dsi_calc_clk_rate_v2(struct msm_dsi_host *msm_host)
>> +{
>> + struct drm_display_mode *mode = msm_host->mode;
>> + u8 lanes = msm_host->lanes;
>> + u32 bpp = dsi_get_bpp(msm_host->format);
>> + u32 pclk_rate;
>> + unsigned int esc_mhz, esc_div;
>> + unsigned long byte_mhz;
>> +
>> + if (!mode) {
>> + pr_err("%s: mode not set\n", __func__);
>> + return -EINVAL;
>> + }
>>
> Or this.
>
>> + pclk_rate = mode->clock * 1000;
>> + if (lanes > 0) {
>> + msm_host->byte_clk_rate = (pclk_rate * bpp) / (8 * lanes);
>> + } else {
>> + pr_err("%s: forcing mdss_dsi lanes to 1\n", __func__);
>> + msm_host->byte_clk_rate = (pclk_rate * bpp) / 8;
>> + }
>> +
>> + DBG("pclk=%d, bclk=%d", pclk_rate, msm_host->byte_clk_rate);
>> +
>> + msm_host->src_clk_rate = (pclk_rate * bpp) / 8;
>> +
>> + /*
>> + * esc clock is byte clock followed by a 4 bit divider,
>> + * we need to find an escape clock frequency within the
>> + * mipi DSI spec range within the maximum divider limit
>> + * We iterate here between an escape clock frequencey
>> + * between 20 Mhz to 5 Mhz and pick up the first one
>> + * that can be supported by our divider
>> + */
>> +
>> + byte_mhz = msm_host->byte_clk_rate / 1000000;
>> +
>> + for (esc_mhz = 20; esc_mhz >= 5; esc_mhz--) {
>> + esc_div = DIV_ROUND_UP(byte_mhz, esc_mhz);
>> +
>> + /*
>> + * TODO: Ideally, we shouldn't know what sort of divider
>> + * is available in mmss_cc, we're just assuming that
>> + * it'll always be a 4 bit divider. Need to come up with
>> + * a better way here.
>> + */
>> + if (esc_div >= 1 && esc_div <= 16)
>> + break;
>> + }
>> +
>> + if (esc_mhz < 5)
>> + return -EINVAL;
>> +
>> + msm_host->esc_clk_rate = msm_host->byte_clk_rate / esc_div;
>> +
>> + DBG("esc=%d, src=%d", msm_host->esc_clk_rate,
>> + msm_host->src_clk_rate);
>> +
>> + return 0;
>> +}
>> +
>> static int dsi_calc_clk_rate(struct msm_dsi_host *msm_host)
>> {
>> struct drm_display_mode *mode = msm_host->mode;
>> @@ -1008,6 +1161,49 @@ static void dsi_wait4video_eng_busy(struct msm_dsi_host *msm_host)
>> }
>> }
>>
>> +int dsi_tx_buf_alloc_6g(struct msm_dsi_host *msm_host, int size)
>> +{
>> + struct drm_device *dev = msm_host->dev;
>> + struct msm_drm_private *priv = dev->dev_private;
>> + int ret;
>> + uint64_t iova;
>> +
>> + msm_host->tx_gem_obj = msm_gem_new(dev, size, MSM_BO_UNCACHED);
>> + if (IS_ERR(msm_host->tx_gem_obj)) {
>> + ret = PTR_ERR(msm_host->tx_gem_obj);
>> + pr_err("%s: failed to allocate gem, %d\n",
>> + __func__, ret);
>> + msm_host->tx_gem_obj = NULL;
>> + return ret;
>> + }
>> +
>> + ret = msm_gem_get_iova(msm_host->tx_gem_obj,
>> + priv->kms->aspace, &iova);
>> + mutex_unlock(&dev->struct_mutex);
Seems like stuct_mutex unlock wasn't removed when they migrated to the
new msm_gem_new and msm_gem_get_iova from the previous lock based functions?
>> + if (ret) {
>> + pr_err("%s: failed to get iova, %d\n", __func__, ret);
>> + return ret;
>> + }
>
> I'm not sure if you also need to vmap this at some point, but we have a handy
> helper function for in-kernel gem objects to automate a bit of this:
>
we eventually do a msm_gem_get_vaddr so msm_gem_kernel_new seems
like a good fit which will also help to remove one additional helper
function :)
> void *msm_gem_kernel_new(struct drm_device *dev, uint32_t size,
> uint32_t flags, struct msm_gem_address_space *aspace,
> struct drm_gem_object **bo, uint64_t *iova);
>
> Jordan
>
--
Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc, is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
More information about the dri-devel
mailing list