summaryrefslogtreecommitdiff
path: root/drivers/video/fbdev/msm
diff options
context:
space:
mode:
authorJeevan Shriram <jshriram@codeaurora.org>2014-09-11 12:11:03 -0700
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-23 20:33:54 -0700
commitd0966f5885bf7e6729af2c0eb1cbdd37ed4e353a (patch)
tree1f17df95f35e985b73bd4d3241cc39699de62061 /drivers/video/fbdev/msm
parenta3888ae72db324b3b6fb28cb7fb7b272ae880189 (diff)
msm: mdss: update the clocks for slave controller
While updating refresh rate through dynamic fps node, clock calculations are still needed for the slave controller and enablement of clock for slave controller is not needed. This change fixes clock updation of slave controller with dynamic fps feature enabled. Change-Id: Ibabe9bddba0633cc9a3441207f39a2f3fa7a8f71 Signed-off-by: Jeevan Shriram <jshriram@codeaurora.org>
Diffstat (limited to 'drivers/video/fbdev/msm')
-rw-r--r--drivers/video/fbdev/msm/mdss_dsi.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/video/fbdev/msm/mdss_dsi.c b/drivers/video/fbdev/msm/mdss_dsi.c
index aa1f746227d7..94f0806562a4 100644
--- a/drivers/video/fbdev/msm/mdss_dsi.c
+++ b/drivers/video/fbdev/msm/mdss_dsi.c
@@ -951,12 +951,6 @@ static int __mdss_dsi_dfps_update_clks(struct mdss_panel_data *pdata,
if (pdata->panel_info.dfps_update
== DFPS_IMMEDIATE_CLK_UPDATE_MODE) {
-
- if (mdss_dsi_is_ctrl_clk_slave(ctrl_pdata)) {
- pr_debug("%s DFPS already updated.\n", __func__);
- return rc;
- }
-
__mdss_dsi_dyn_refresh_config(ctrl_pdata);
__mdss_dsi_calc_dfps_delay(pdata);
ctrl_pdata->pclk_rate =
@@ -967,6 +961,11 @@ static int __mdss_dsi_dfps_update_clks(struct mdss_panel_data *pdata,
pr_debug("byte_rate=%i\n", ctrl_pdata->byte_clk_rate);
pr_debug("pclk_rate=%i\n", ctrl_pdata->pclk_rate);
+ if (mdss_dsi_is_ctrl_clk_slave(ctrl_pdata)) {
+ pr_debug("%s DFPS already updated.\n", __func__);
+ return rc;
+ }
+
/* add an extra reference to main clks */
clk_prepare_enable(ctrl_pdata->pll_byte_clk);
clk_prepare_enable(ctrl_pdata->pll_pixel_clk);