From: Lin Huang <h...@rock-chips.com>

When panel is shut down, we should make sure edp can be disabled to avoid
undefined behavior.

Cc: Stéphane Marchesin <marc...@chromium.org>
Signed-off-by: Lin Huang <h...@rock-chips.com>
Signed-off-by: zain wang <w...@rock-chips.com>
Signed-off-by: Sean Paul <seanp...@chromium.org>
Signed-off-by: Thierry Escande <thierry.esca...@collabora.com>
Reviewed-by: Andrzej Hajda <a.ha...@samsung.com>
---
 drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c 
b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
index c940a5bb80ac..fa4ef28e286f 100644
--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
@@ -1161,6 +1161,12 @@ static int analogix_dp_set_bridge(struct 
analogix_dp_device *dp)
 
        pm_runtime_get_sync(dp->dev);
 
+       ret = clk_prepare_enable(dp->clock);
+       if (ret < 0) {
+               DRM_ERROR("Failed to prepare_enable the clock clk [%d]\n", ret);
+               goto out_dp_clk_pre;
+       }
+
        if (dp->plat_data->power_on)
                dp->plat_data->power_on(dp->plat_data);
 
@@ -1192,6 +1198,8 @@ static int analogix_dp_set_bridge(struct 
analogix_dp_device *dp)
        phy_power_off(dp->phy);
        if (dp->plat_data->power_off)
                dp->plat_data->power_off(dp->plat_data);
+       clk_disable_unprepare(dp->clock);
+out_dp_clk_pre:
        pm_runtime_put_sync(dp->dev);
 
        return ret;
@@ -1235,10 +1243,13 @@ static void analogix_dp_bridge_disable(struct 
drm_bridge *bridge)
 
        disable_irq(dp->irq);
        phy_power_off(dp->phy);
+       analogix_dp_set_analog_power_down(dp, POWER_ALL, 1);
 
        if (dp->plat_data->power_off)
                dp->plat_data->power_off(dp->plat_data);
 
+       clk_disable_unprepare(dp->clock);
+
        pm_runtime_put_sync(dp->dev);
 
        ret = analogix_dp_prepare_panel(dp, false, true);
-- 
2.14.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Reply via email to