samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "disp: msm: dsi: defer clk setting when doing const_fps RFI"

Browse Source
This commit is contained in:
qctecmdr
2021-03-24 14:16:57 -07:00
committed by Gerrit - the friendly Code Review server
parent 7d1ca7c295 484387e860
commit ee2a505703
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
msm/dsi/dsi_display.c
View File

@@ -4529,7 +4529,7 @@ static int _dsi_display_dyn_update_clks(struct dsi_display *display,
*/ */
if ((ctrl_version >= DSI_CTRL_VERSION_2_5) && if ((ctrl_version >= DSI_CTRL_VERSION_2_5) &&
(dyn_clk_caps->maintain_const_fps)) (dyn_clk_caps->maintain_const_fps))
goto defer_dfps_wait; return 0;
/* wait for dynamic refresh done */ /* wait for dynamic refresh done */
display_for_each_ctrl(i, display) { display_for_each_ctrl(i, display) {
@@ -4549,7 +4549,6 @@ static int _dsi_display_dyn_update_clks(struct dsi_display *display,
dsi_phy_dynamic_refresh_clear(ctrl->phy); dsi_phy_dynamic_refresh_clear(ctrl->phy);
} }
defer_dfps_wait:
if (rc) if (rc)
DSI_ERR("could not switch back to src clks %d\n", rc); DSI_ERR("could not switch back to src clks %d\n", rc);

3
msm/dsi/dsi_drm.c
View File

@@ -1138,6 +1138,9 @@ int dsi_conn_post_kickoff(struct drm_connector *connector,
ctrl->ctrl); ctrl->ctrl);
if (rc) if (rc)
DSI_ERR("wait4dfps refresh failed\n"); DSI_ERR("wait4dfps refresh failed\n");
dsi_phy_dynamic_refresh_clear(ctrl->phy);
dsi_clk_disable_unprepare(&display->clock_info.pll_clks);
} }
} }