From d0966f5885bf7e6729af2c0eb1cbdd37ed4e353a Mon Sep 17 00:00:00 2001 From: Jeevan Shriram Date: Thu, 11 Sep 2014 12:11:03 -0700 Subject: [PATCH] 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 --- drivers/video/fbdev/msm/mdss_dsi.c | 11 +++++------ 1 file 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);