| Message ID | 1520860994-23334-3-git-send-email-sibis@codeaurora.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Mar 12, 2018 at 06:53:11PM +0530, Sibi S wrote: > Add dsi host helper function implementation for DSI v2 > and DSI 6G 1.x controllers > > Signed-off-by: Sibi S <sibis@codeaurora.org> > --- > drivers/gpu/drm/msm/dsi/dsi.h | 15 +++ > drivers/gpu/drm/msm/dsi/dsi_cfg.c | 44 +++++-- > drivers/gpu/drm/msm/dsi/dsi_host.c | 250 ++++++++++++++++++++++++++++++++++++- > 3 files changed, 298 insertions(+), 11 deletions(-) <snip> > static int dsi_calc_clk_rate(struct msm_dsi_host *msm_host) > { > struct drm_display_mode *mode = msm_host->mode; > @@ -1008,6 +1161,59 @@ 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); > + if (ret) { > + pr_err("%s: failed to get iova, %d\n", __func__, ret); > + return ret; > + } > + > + if (iova & 0x07) { > + pr_err("%s: buf NOT 8 bytes aligned\n", __func__); > + return -EINVAL; > + } This is impossible - new allocations will always be page aligned. > + msm_host->tx_size = msm_host->tx_gem_obj->size; > + > + return 0; > +} > + > +int dsi_tx_buf_alloc_v2(struct msm_dsi_host *msm_host, int size) > +{ > + struct drm_device *dev = msm_host->dev; > + int ret; > + > + msm_host->tx_buf = dma_alloc_coherent(dev->dev, size, > + &msm_host->tx_buf_paddr, GFP_KERNEL); > + if (!msm_host->tx_buf) { > + ret = -ENOMEM; > + pr_err("%s: failed to allocate tx buf, %d\n", > + __func__, ret); You don't need to print ret here, it isn't a mystery what it is. In fact, you probably don't need to print anything here at all because dma_alloc_coherent should be pretty noisy when it fails. > + return ret; This can just be return -ENOMEM and you can lose 'ret'. > + } > + > + msm_host->tx_size = size; > + > + return 0; > +} > + > /* dsi_cmd */ > static int dsi_tx_buf_alloc(struct msm_dsi_host *msm_host, int size) > { > @@ -1072,6 +1278,21 @@ static void dsi_tx_buf_free(struct msm_dsi_host *msm_host) > msm_host->tx_buf_paddr); > } > > +void *dsi_tx_buf_get_6g(struct msm_dsi_host *msm_host) > +{ > + return msm_gem_get_vaddr(msm_host->tx_gem_obj); > +} > + > +void *dsi_tx_buf_get_v2(struct msm_dsi_host *msm_host) > +{ > + return msm_host->tx_buf; > +} > + > +void dsi_tx_buf_put_6g(struct msm_dsi_host *msm_host) > +{ > + msm_gem_put_vaddr(msm_host->tx_gem_obj); > +} > + > /* > * prepare cmd buffer to be txed > */ > @@ -1173,6 +1394,31 @@ static int dsi_long_read_resp(u8 *buf, const struct mipi_dsi_msg *msg) > return msg->rx_len; > } > > +int dsi_dma_base_get_6g(struct msm_dsi_host *msm_host, uint64_t *dma_base) > +{ > + struct drm_device *dev = msm_host->dev; > + struct msm_drm_private *priv = dev->dev_private; > + uint64_t **iova; > + int ret; > + > + if (!dma_base) > + return -EINVAL; > + > + iova = &dma_base; This is a convoluted way of passing in the pointer and I doubt even the compiler can see through it. > + ret = msm_gem_get_iova(msm_host->tx_gem_obj, > + priv->kms->aspace, *iova); ret = msm_gem_get_iova(msm_host->tx_gem_obj, priv->kms->aspace, dma_base); Easy, safe effective > + return ret; If you put a return on the front of the msm_gem_get_iova you can eliminate the need for 'ret'. Jordan
On Monday 12 March 2018 06:53 PM, Sibi S wrote: > Add dsi host helper function implementation for DSI v2 > and DSI 6G 1.x controllers > > Signed-off-by: Sibi S <sibis@codeaurora.org> > --- > drivers/gpu/drm/msm/dsi/dsi.h | 15 +++ > drivers/gpu/drm/msm/dsi/dsi_cfg.c | 44 +++++-- > drivers/gpu/drm/msm/dsi/dsi_host.c | 250 ++++++++++++++++++++++++++++++++++++- > 3 files changed, 298 insertions(+), 11 deletions(-) > > diff --git a/drivers/gpu/drm/msm/dsi/dsi.h b/drivers/gpu/drm/msm/dsi/dsi.h > index 80be83e..dfa049d 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 0327bb5..dc51aaa 100644 > --- a/drivers/gpu/drm/msm/dsi/dsi_cfg.c > +++ b/drivers/gpu/drm/msm/dsi/dsi_cfg.c > @@ -136,20 +136,46 @@ > .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, > +}; Could you introduce the host ops for SDM845 (i.e, msm_dsi_6g_v2_host_ops) in this patch itself? It would be nice to keep the DSI command broadcast code as a separate patch since it probably needs to go through more iterations. The ops approach looks good otherwise. Thanks, Archit > 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_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 7a03a94..f7a066d 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; > + } > + > + 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; > + } > + > + 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,59 @@ 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); > + if (ret) { > + pr_err("%s: failed to get iova, %d\n", __func__, ret); > + return ret; > + } > + > + if (iova & 0x07) { > + pr_err("%s: buf NOT 8 bytes aligned\n", __func__); > + return -EINVAL; > + } > + > + msm_host->tx_size = msm_host->tx_gem_obj->size; > + > + return 0; > +} > + > +int dsi_tx_buf_alloc_v2(struct msm_dsi_host *msm_host, int size) > +{ > + struct drm_device *dev = msm_host->dev; > + int ret; > + > + msm_host->tx_buf = dma_alloc_coherent(dev->dev, size, > + &msm_host->tx_buf_paddr, GFP_KERNEL); > + if (!msm_host->tx_buf) { > + ret = -ENOMEM; > + pr_err("%s: failed to allocate tx buf, %d\n", > + __func__, ret); > + return ret; > + } > + > + msm_host->tx_size = size; > + > + return 0; > +} > + > /* dsi_cmd */ > static int dsi_tx_buf_alloc(struct msm_dsi_host *msm_host, int size) > { > @@ -1072,6 +1278,21 @@ static void dsi_tx_buf_free(struct msm_dsi_host *msm_host) > msm_host->tx_buf_paddr); > } > > +void *dsi_tx_buf_get_6g(struct msm_dsi_host *msm_host) > +{ > + return msm_gem_get_vaddr(msm_host->tx_gem_obj); > +} > + > +void *dsi_tx_buf_get_v2(struct msm_dsi_host *msm_host) > +{ > + return msm_host->tx_buf; > +} > + > +void dsi_tx_buf_put_6g(struct msm_dsi_host *msm_host) > +{ > + msm_gem_put_vaddr(msm_host->tx_gem_obj); > +} > + > /* > * prepare cmd buffer to be txed > */ > @@ -1173,6 +1394,31 @@ static int dsi_long_read_resp(u8 *buf, const struct mipi_dsi_msg *msg) > return msg->rx_len; > } > > +int dsi_dma_base_get_6g(struct msm_dsi_host *msm_host, uint64_t *dma_base) > +{ > + struct drm_device *dev = msm_host->dev; > + struct msm_drm_private *priv = dev->dev_private; > + uint64_t **iova; > + int ret; > + > + if (!dma_base) > + return -EINVAL; > + > + iova = &dma_base; > + ret = msm_gem_get_iova(msm_host->tx_gem_obj, > + priv->kms->aspace, *iova); > + return ret; > +} > + > +int dsi_dma_base_get_v2(struct msm_dsi_host *msm_host, uint64_t *dma_base) > +{ > + if (!dma_base) > + return -EINVAL; > + > + *dma_base = msm_host->tx_buf_paddr; > + return 0; > +} > + > static int dsi_cmd_dma_tx(struct msm_dsi_host *msm_host, int len) > { > const struct msm_dsi_cfg_handler *cfg_hnd = msm_host->cfg_hnd; >
Hi Jordan, Thanks for the review. Will incorporate the suggested changes in v2. On 03/12/2018 08:43 PM, Jordan Crouse wrote: > On Mon, Mar 12, 2018 at 06:53:11PM +0530, Sibi S wrote: >> Add dsi host helper function implementation for DSI v2 >> and DSI 6G 1.x controllers >> >> Signed-off-by: Sibi S <sibis@codeaurora.org> >> --- >> drivers/gpu/drm/msm/dsi/dsi.h | 15 +++ >> drivers/gpu/drm/msm/dsi/dsi_cfg.c | 44 +++++-- >> drivers/gpu/drm/msm/dsi/dsi_host.c | 250 ++++++++++++++++++++++++++++++++++++- >> 3 files changed, 298 insertions(+), 11 deletions(-) > > <snip> >> static int dsi_calc_clk_rate(struct msm_dsi_host *msm_host) >> { >> struct drm_display_mode *mode = msm_host->mode; >> @@ -1008,6 +1161,59 @@ 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); >> + if (ret) { >> + pr_err("%s: failed to get iova, %d\n", __func__, ret); >> + return ret; >> + } >> + >> + if (iova & 0x07) { >> + pr_err("%s: buf NOT 8 bytes aligned\n", __func__); >> + return -EINVAL; >> + } > > This is impossible - new allocations will always be page aligned. > Its always good to review and remove older code paths :). Sure will remove this check. >> + msm_host->tx_size = msm_host->tx_gem_obj->size; >> + >> + return 0; >> +} >> + >> +int dsi_tx_buf_alloc_v2(struct msm_dsi_host *msm_host, int size) >> +{ >> + struct drm_device *dev = msm_host->dev; >> + int ret; >> + >> + msm_host->tx_buf = dma_alloc_coherent(dev->dev, size, >> + &msm_host->tx_buf_paddr, GFP_KERNEL); >> + if (!msm_host->tx_buf) { >> + ret = -ENOMEM; >> + pr_err("%s: failed to allocate tx buf, %d\n", >> + __func__, ret); > > You don't need to print ret here, it isn't a mystery what it is. In fact, you > probably don't need to print anything here at all because dma_alloc_coherent > should be pretty noisy when it fails. > >> + return ret; > > This can just be return -ENOMEM and you can lose 'ret'. > yep makes sense, will replace it. >> + } >> + >> + msm_host->tx_size = size; >> + >> + return 0; >> +} >> + >> /* dsi_cmd */ >> static int dsi_tx_buf_alloc(struct msm_dsi_host *msm_host, int size) >> { >> @@ -1072,6 +1278,21 @@ static void dsi_tx_buf_free(struct msm_dsi_host *msm_host) >> msm_host->tx_buf_paddr); >> } >> >> +void *dsi_tx_buf_get_6g(struct msm_dsi_host *msm_host) >> +{ >> + return msm_gem_get_vaddr(msm_host->tx_gem_obj); >> +} >> + >> +void *dsi_tx_buf_get_v2(struct msm_dsi_host *msm_host) >> +{ >> + return msm_host->tx_buf; >> +} >> + >> +void dsi_tx_buf_put_6g(struct msm_dsi_host *msm_host) >> +{ >> + msm_gem_put_vaddr(msm_host->tx_gem_obj); >> +} >> + >> /* >> * prepare cmd buffer to be txed >> */ >> @@ -1173,6 +1394,31 @@ static int dsi_long_read_resp(u8 *buf, const struct mipi_dsi_msg *msg) >> return msg->rx_len; >> } >> >> +int dsi_dma_base_get_6g(struct msm_dsi_host *msm_host, uint64_t *dma_base) >> +{ >> + struct drm_device *dev = msm_host->dev; >> + struct msm_drm_private *priv = dev->dev_private; >> + uint64_t **iova; >> + int ret; >> + >> + if (!dma_base) >> + return -EINVAL; >> + >> + iova = &dma_base; > > This is a convoluted way of passing in the pointer and I doubt even the compiler > can see through it. > >> + ret = msm_gem_get_iova(msm_host->tx_gem_obj, >> + priv->kms->aspace, *iova); > > ret = msm_gem_get_iova(msm_host->tx_gem_obj, priv->kms->aspace, dma_base); > > Easy, safe effective > >> + return ret; > > If you put a return on the front of the msm_gem_get_iova you can eliminate the > need for 'ret'. > ok will do just that. > Jordan >
Hi Archit, Thanks for the review. On 03/13/2018 10:49 AM, Archit Taneja wrote: > > > On Monday 12 March 2018 06:53 PM, Sibi S wrote: >> Add dsi host helper function implementation for DSI v2 >> and DSI 6G 1.x controllers >> >> Signed-off-by: Sibi S <sibis@codeaurora.org> >> --- >> drivers/gpu/drm/msm/dsi/dsi.h | 15 +++ >> drivers/gpu/drm/msm/dsi/dsi_cfg.c | 44 +++++-- >> drivers/gpu/drm/msm/dsi/dsi_host.c | 250 >> ++++++++++++++++++++++++++++++++++++- >> 3 files changed, 298 insertions(+), 11 deletions(-) >> >> diff --git a/drivers/gpu/drm/msm/dsi/dsi.h >> b/drivers/gpu/drm/msm/dsi/dsi.h >> index 80be83e..dfa049d 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 0327bb5..dc51aaa 100644 >> --- a/drivers/gpu/drm/msm/dsi/dsi_cfg.c >> +++ b/drivers/gpu/drm/msm/dsi/dsi_cfg.c >> @@ -136,20 +136,46 @@ >> .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, >> +}; > > Could you introduce the host ops for SDM845 (i.e, > msm_dsi_6g_v2_host_ops) in this patch itself? It would be nice to > keep the DSI command broadcast code as a separate patch since it > probably needs to go through more iterations. > > The ops approach looks good otherwise. > > Thanks, > Archit > Sure I'll re-order them and probably should separately post separate patch series for command broadcast on sdm845. >> 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_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 7a03a94..f7a066d 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; >> + } >> + >> + 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; >> + } >> + >> + 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,59 @@ 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); >> + if (ret) { >> + pr_err("%s: failed to get iova, %d\n", __func__, ret); >> + return ret; >> + } >> + >> + if (iova & 0x07) { >> + pr_err("%s: buf NOT 8 bytes aligned\n", __func__); >> + return -EINVAL; >> + } >> + >> + msm_host->tx_size = msm_host->tx_gem_obj->size; >> + >> + return 0; >> +} >> + >> +int dsi_tx_buf_alloc_v2(struct msm_dsi_host *msm_host, int size) >> +{ >> + struct drm_device *dev = msm_host->dev; >> + int ret; >> + >> + msm_host->tx_buf = dma_alloc_coherent(dev->dev, size, >> + &msm_host->tx_buf_paddr, GFP_KERNEL); >> + if (!msm_host->tx_buf) { >> + ret = -ENOMEM; >> + pr_err("%s: failed to allocate tx buf, %d\n", >> + __func__, ret); >> + return ret; >> + } >> + >> + msm_host->tx_size = size; >> + >> + return 0; >> +} >> + >> /* dsi_cmd */ >> static int dsi_tx_buf_alloc(struct msm_dsi_host *msm_host, int size) >> { >> @@ -1072,6 +1278,21 @@ static void dsi_tx_buf_free(struct msm_dsi_host >> *msm_host) >> msm_host->tx_buf_paddr); >> } >> +void *dsi_tx_buf_get_6g(struct msm_dsi_host *msm_host) >> +{ >> + return msm_gem_get_vaddr(msm_host->tx_gem_obj); >> +} >> + >> +void *dsi_tx_buf_get_v2(struct msm_dsi_host *msm_host) >> +{ >> + return msm_host->tx_buf; >> +} >> + >> +void dsi_tx_buf_put_6g(struct msm_dsi_host *msm_host) >> +{ >> + msm_gem_put_vaddr(msm_host->tx_gem_obj); >> +} >> + >> /* >> * prepare cmd buffer to be txed >> */ >> @@ -1173,6 +1394,31 @@ static int dsi_long_read_resp(u8 *buf, const >> struct mipi_dsi_msg *msg) >> return msg->rx_len; >> } >> +int dsi_dma_base_get_6g(struct msm_dsi_host *msm_host, uint64_t >> *dma_base) >> +{ >> + struct drm_device *dev = msm_host->dev; >> + struct msm_drm_private *priv = dev->dev_private; >> + uint64_t **iova; >> + int ret; >> + >> + if (!dma_base) >> + return -EINVAL; >> + >> + iova = &dma_base; >> + ret = msm_gem_get_iova(msm_host->tx_gem_obj, >> + priv->kms->aspace, *iova); >> + return ret; >> +} >> + >> +int dsi_dma_base_get_v2(struct msm_dsi_host *msm_host, uint64_t >> *dma_base) >> +{ >> + if (!dma_base) >> + return -EINVAL; >> + >> + *dma_base = msm_host->tx_buf_paddr; >> + return 0; >> +} >> + >> static int dsi_cmd_dma_tx(struct msm_dsi_host *msm_host, int len) >> { >> const struct msm_dsi_cfg_handler *cfg_hnd = msm_host->cfg_hnd; >> >
diff --git a/drivers/gpu/drm/msm/dsi/dsi.h b/drivers/gpu/drm/msm/dsi/dsi.h index 80be83e..dfa049d 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 0327bb5..dc51aaa 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_cfg.c +++ b/drivers/gpu/drm/msm/dsi/dsi_cfg.c @@ -136,20 +136,46 @@ .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, +}; 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_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 7a03a94..f7a066d 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; + } + + 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; + } + + 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,59 @@ 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); + if (ret) { + pr_err("%s: failed to get iova, %d\n", __func__, ret); + return ret; + } + + if (iova & 0x07) { + pr_err("%s: buf NOT 8 bytes aligned\n", __func__); + return -EINVAL; + } + + msm_host->tx_size = msm_host->tx_gem_obj->size; + + return 0; +} + +int dsi_tx_buf_alloc_v2(struct msm_dsi_host *msm_host, int size) +{ + struct drm_device *dev = msm_host->dev; + int ret; + + msm_host->tx_buf = dma_alloc_coherent(dev->dev, size, + &msm_host->tx_buf_paddr, GFP_KERNEL); + if (!msm_host->tx_buf) { + ret = -ENOMEM; + pr_err("%s: failed to allocate tx buf, %d\n", + __func__, ret); + return ret; + } + + msm_host->tx_size = size; + + return 0; +} + /* dsi_cmd */ static int dsi_tx_buf_alloc(struct msm_dsi_host *msm_host, int size) { @@ -1072,6 +1278,21 @@ static void dsi_tx_buf_free(struct msm_dsi_host *msm_host) msm_host->tx_buf_paddr); } +void *dsi_tx_buf_get_6g(struct msm_dsi_host *msm_host) +{ + return msm_gem_get_vaddr(msm_host->tx_gem_obj); +} + +void *dsi_tx_buf_get_v2(struct msm_dsi_host *msm_host) +{ + return msm_host->tx_buf; +} + +void dsi_tx_buf_put_6g(struct msm_dsi_host *msm_host) +{ + msm_gem_put_vaddr(msm_host->tx_gem_obj); +} + /* * prepare cmd buffer to be txed */ @@ -1173,6 +1394,31 @@ static int dsi_long_read_resp(u8 *buf, const struct mipi_dsi_msg *msg) return msg->rx_len; } +int dsi_dma_base_get_6g(struct msm_dsi_host *msm_host, uint64_t *dma_base) +{ + struct drm_device *dev = msm_host->dev; + struct msm_drm_private *priv = dev->dev_private; + uint64_t **iova; + int ret; + + if (!dma_base) + return -EINVAL; + + iova = &dma_base; + ret = msm_gem_get_iova(msm_host->tx_gem_obj, + priv->kms->aspace, *iova); + return ret; +} + +int dsi_dma_base_get_v2(struct msm_dsi_host *msm_host, uint64_t *dma_base) +{ + if (!dma_base) + return -EINVAL; + + *dma_base = msm_host->tx_buf_paddr; + return 0; +} + static int dsi_cmd_dma_tx(struct msm_dsi_host *msm_host, int len) { const struct msm_dsi_cfg_handler *cfg_hnd = msm_host->cfg_hnd;
Add dsi host helper function implementation for DSI v2 and DSI 6G 1.x controllers Signed-off-by: Sibi S <sibis@codeaurora.org> --- drivers/gpu/drm/msm/dsi/dsi.h | 15 +++ drivers/gpu/drm/msm/dsi/dsi_cfg.c | 44 +++++-- drivers/gpu/drm/msm/dsi/dsi_host.c | 250 ++++++++++++++++++++++++++++++++++++- 3 files changed, 298 insertions(+), 11 deletions(-)