| Message ID | 20240503151129.3901815-8-l.stach@pengutronix.de |
|---|---|
| State | Superseded |
| Headers | show |
| Series | improve Analogix DP AUX channel handling | expand |
On Fri, May 3, 2024 at 5:12 PM Lucas Stach <l.stach@pengutronix.de> wrote: > > 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> > --- > .../drm/bridge/analogix/analogix_dp_core.c | 23 ++++++++----------- > 1 file changed, 10 insertions(+), 13 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c > index 311e1e67486d..3281c00a39cd 100644 > --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c > +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c > @@ -1258,11 +1258,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; > @@ -1288,10 +1283,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; > @@ -1354,11 +1345,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); > > @@ -1713,6 +1700,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; > @@ -1729,6 +1721,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); > -- > 2.39.2 > Reviewed-by: Robert Foss <rfoss@kernel.org>
diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c index 311e1e67486d..3281c00a39cd 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c @@ -1258,11 +1258,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; @@ -1288,10 +1283,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; @@ -1354,11 +1345,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); @@ -1713,6 +1700,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; @@ -1729,6 +1721,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);
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> --- .../drm/bridge/analogix/analogix_dp_core.c | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-)