]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
drm/bridge: analogix_dp: move platform and PHY power handling into runtime PM
authorLucas Stach <l.stach@pengutronix.de>
Wed, 19 Jun 2024 18:21:53 +0000 (20:21 +0200)
committerRobert Foss <rfoss@kernel.org>
Thu, 27 Jun 2024 09:52:07 +0000 (11:52 +0200)
Platform and PHY power isn't only required when the actual display data
stream is active, but may be required earlier to support AUX channel
transactions. Move them into the runtime PM calls, so they are properly
managed whenever various other parts of the driver need them to be active.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Reviewed-by: Robert Foss <rfoss@kernel.org>
Tested-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Robert Foss <rfoss@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20240619182200.3752465-7-l.stach@pengutronix.de
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c

index d8c0751ab5c0f9962bcfe664ca4038d18fa787e6..d2b6d5a8718820f37bcec32974cb48e0e2eabc9f 100644 (file)
@@ -1251,11 +1251,6 @@ static int analogix_dp_set_bridge(struct analogix_dp_device *dp)
 
        pm_runtime_get_sync(dp->dev);
 
-       if (dp->plat_data->power_on)
-               dp->plat_data->power_on(dp->plat_data);
-
-       phy_power_on(dp->phy);
-
        ret = analogix_dp_init_dp(dp);
        if (ret)
                goto out_dp_init;
@@ -1281,10 +1276,6 @@ static int analogix_dp_set_bridge(struct analogix_dp_device *dp)
        return 0;
 
 out_dp_init:
-       phy_power_off(dp->phy);
-       if (dp->plat_data->power_off)
-               dp->plat_data->power_off(dp->plat_data);
-
        pm_runtime_put_sync(dp->dev);
 
        return ret;
@@ -1347,11 +1338,7 @@ static void analogix_dp_bridge_disable(struct drm_bridge *bridge)
 
        disable_irq(dp->irq);
 
-       if (dp->plat_data->power_off)
-               dp->plat_data->power_off(dp->plat_data);
-
        analogix_dp_set_analog_power_down(dp, POWER_ALL, 1);
-       phy_power_off(dp->phy);
 
        pm_runtime_put_sync(dp->dev);
 
@@ -1705,6 +1692,11 @@ EXPORT_SYMBOL_GPL(analogix_dp_probe);
 
 int analogix_dp_suspend(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);
 
        return 0;
@@ -1721,6 +1713,11 @@ int analogix_dp_resume(struct analogix_dp_device *dp)
                return ret;
        }
 
+       if (dp->plat_data->power_on)
+               dp->plat_data->power_on(dp->plat_data);
+
+       phy_power_on(dp->phy);
+
        return 0;
 }
 EXPORT_SYMBOL_GPL(analogix_dp_resume);