| From fc3a96cbf4ed9d6e79870f55bbfb78b3c6248b26 Mon Sep 17 00:00:00 2001 |
| From: Harigovindan P <harigovi@codeaurora.org> |
| Date: Thu, 6 Feb 2020 14:26:15 +0530 |
| Subject: [PATCH] drm/msm/dsi: save pll state before dsi host is powered off |
| |
| commit a1028dcfd0dd97884072288d0c8ed7f30399b528 upstream. |
| |
| Save pll state before dsi host is powered off. Without this change |
| some register values gets resetted. |
| |
| Signed-off-by: Harigovindan P <harigovi@codeaurora.org> |
| Signed-off-by: Rob Clark <robdclark@chromium.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/gpu/drm/msm/dsi/dsi_manager.c b/drivers/gpu/drm/msm/dsi/dsi_manager.c |
| index b61ced4dcb72..969c4b64a110 100644 |
| --- a/drivers/gpu/drm/msm/dsi/dsi_manager.c |
| +++ b/drivers/gpu/drm/msm/dsi/dsi_manager.c |
| @@ -463,6 +463,7 @@ static void dsi_mgr_bridge_post_disable(struct drm_bridge *bridge) |
| struct msm_dsi *msm_dsi1 = dsi_mgr_get_dsi(DSI_1); |
| struct mipi_dsi_host *host = msm_dsi->host; |
| struct drm_panel *panel = msm_dsi->panel; |
| + struct msm_dsi_pll *src_pll; |
| bool is_dual_dsi = IS_DUAL_DSI(); |
| int ret; |
| |
| @@ -503,6 +504,10 @@ static void dsi_mgr_bridge_post_disable(struct drm_bridge *bridge) |
| id, ret); |
| } |
| |
| + /* Save PLL status if it is a clock source */ |
| + src_pll = msm_dsi_phy_get_pll(msm_dsi->phy); |
| + msm_dsi_pll_save_state(src_pll); |
| + |
| ret = msm_dsi_host_power_off(host); |
| if (ret) |
| pr_err("%s: host %d power off failed,%d\n", __func__, id, ret); |
| diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy.c b/drivers/gpu/drm/msm/dsi/phy/dsi_phy.c |
| index bc6f64b202f3..1b7c1bcb3140 100644 |
| --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy.c |
| +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy.c |
| @@ -718,10 +718,6 @@ void msm_dsi_phy_disable(struct msm_dsi_phy *phy) |
| if (!phy || !phy->cfg->ops.disable) |
| return; |
| |
| - /* Save PLL status if it is a clock source */ |
| - if (phy->usecase != MSM_DSI_PHY_SLAVE) |
| - msm_dsi_pll_save_state(phy->pll); |
| - |
| phy->cfg->ops.disable(phy); |
| |
| dsi_phy_regulator_disable(phy); |
| -- |
| 2.7.4 |
| |