diff options
| author | Ashish Garg <ashigarg@codeaurora.org> | 2016-06-09 01:13:38 +0530 |
|---|---|---|
| committer | Harsh Sahu <hsahu@codeaurora.org> | 2016-12-12 14:06:51 -0800 |
| commit | 4c6bee77c35fd1de7667efdd282a5280d99997c5 (patch) | |
| tree | f1127aa800a2d486fad92db4a1918a2cb6e461db /drivers/video/fbdev/msm | |
| parent | 6d0127467c52e965abcde233b12a046017ca0bf2 (diff) | |
msm: mdss: Fix dynamic refresh sequence
Dynamic refresh done interrupt is received and it is cleared.
Unmasking of PLL_UNLOCKED interrupt should be done only after
checking if RESETSM_READY_STATUS.CORE_READY is 1. This would
ensure that the clocks are in proper state before PLL_UNLOCKED
interrupt is unmasked.
Change-Id: I5d5762fada1a0722d0eb71fd9006d14e847ca388
Signed-off-by: Ashish Garg <ashigarg@codeaurora.org>
Diffstat (limited to 'drivers/video/fbdev/msm')
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_dsi.c | 7 | ||||
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_dsi.h | 1 | ||||
| -rw-r--r-- | drivers/video/fbdev/msm/msm_mdss_io_8974.c | 16 |
3 files changed, 24 insertions, 0 deletions
diff --git a/drivers/video/fbdev/msm/mdss_dsi.c b/drivers/video/fbdev/msm/mdss_dsi.c index a43332f94559..6e66c578cfef 100644 --- a/drivers/video/fbdev/msm/mdss_dsi.c +++ b/drivers/video/fbdev/msm/mdss_dsi.c @@ -2086,6 +2086,13 @@ static int __mdss_dsi_dfps_update_clks(struct mdss_panel_data *pdata, MIPI_OUTP((sctrl_pdata->ctrl_base) + DSI_DYNAMIC_REFRESH_CTRL, 0x00); + rc = mdss_dsi_phy_pll_reset_status(ctrl_pdata); + if (rc) { + pr_err("%s: pll cannot be locked reset core ready failed %d\n", + __func__, rc); + goto dfps_timeout; + } + __mdss_dsi_mask_dfps_errors(ctrl_pdata, false); if (sctrl_pdata) __mdss_dsi_mask_dfps_errors(sctrl_pdata, false); diff --git a/drivers/video/fbdev/msm/mdss_dsi.h b/drivers/video/fbdev/msm/mdss_dsi.h index 6c840c8459ae..1743a5f23b5d 100644 --- a/drivers/video/fbdev/msm/mdss_dsi.h +++ b/drivers/video/fbdev/msm/mdss_dsi.h @@ -694,6 +694,7 @@ void mdss_dsi_dfps_config_8996(struct mdss_dsi_ctrl_pdata *ctrl); void mdss_dsi_set_burst_mode(struct mdss_dsi_ctrl_pdata *ctrl); void mdss_dsi_set_reg(struct mdss_dsi_ctrl_pdata *ctrl, int off, u32 mask, u32 val); +int mdss_dsi_phy_pll_reset_status(struct mdss_dsi_ctrl_pdata *ctrl); static inline const char *__mdss_dsi_pm_name(enum dsi_pm_type module) { diff --git a/drivers/video/fbdev/msm/msm_mdss_io_8974.c b/drivers/video/fbdev/msm/msm_mdss_io_8974.c index fdd888edc2fb..3dc2e952b5dd 100644 --- a/drivers/video/fbdev/msm/msm_mdss_io_8974.c +++ b/drivers/video/fbdev/msm/msm_mdss_io_8974.c @@ -16,6 +16,8 @@ #include <linux/err.h> #include <linux/io.h> #include <linux/clk/msm-clk.h> +#include <linux/iopoll.h> +#include <linux/kthread.h> #include "mdss_dsi.h" #include "mdss_dp.h" @@ -427,6 +429,20 @@ static void mdss_dsi_ctrl_phy_reset(struct mdss_dsi_ctrl_pdata *ctrl) wmb(); /* maek sure reset cleared */ } +int mdss_dsi_phy_pll_reset_status(struct mdss_dsi_ctrl_pdata *ctrl) +{ + int rc; + u32 val; + u32 const sleep_us = 10, timeout_us = 100; + + pr_debug("%s: polling for RESETSM_READY_STATUS.CORE_READY\n", + __func__); + rc = readl_poll_timeout(ctrl->phy_io.base + 0x4cc, val, + (val & 0x1), sleep_us, timeout_us); + + return rc; +} + static void mdss_dsi_phy_sw_reset_sub(struct mdss_dsi_ctrl_pdata *ctrl) { struct mdss_dsi_ctrl_pdata *sctrl = NULL; |