drm/msm/dp: power off DP phy at suspend
PATCH v3 1/1 drm/msm/dp: power off DP phy at suspend
Normal DP suspend operation contains two steps, display off followed by dp suspend, to complete system wide suspending cycle if display is up at that time. In this case, DP phy will be powered off at display off. However there is an exception case that depending on the timing of dongle plug in during system wide suspending, sometimes display off procedure may be skipped and dp suspend was called directly. In this case, dp phy is stay at powered on (phy->power_count = 1) so that at next resume dp driver crash at main link clock enable due to phy is not physically powered on. This patch will call dp_ctrl_off_link_stream() to tear down main link and power off phy at dp_pm_suspend() if main link had been brought up.
Changes in V2:
-- stashed changes into dp_ctrl.c
-- add is_phy_on to monitor phy state
Changes in V3:
-- delete is_phy_on
-- call dp_ctrl_off_link_stream() from dp_pm_suspend()
--- drivers/gpu/drm/msm/dp/dp_ctrl.c | 10 +++++++++- drivers/gpu/drm/msm/dp/dp_display.c | 4 +++- drivers/gpu/drm/msm/dp/dp_power.c | 15 +++++++++++++++ 3 files changed, 27 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/dp/dp_ctrl.c +9 -1
@@ -1414,6 +1414,7 @@ void dp_ctrl_host_deinit(struct dp_ctrl *dp_ctrl) phy = dp_io->phy;dp_catalog_ctrl_enable_irq (ctrl->catalog, false); +phy_exit (phy);DRM_DEBUG_DP ("Host deinitialized successfully\n" );
@@ -1457,6 +1458,7 @@ static int dp_ctrl_reinitialize_mainlink(struct dp_ctrl_private *ctrl)return ret; }phy_power_off (phy); +/* hw recommended delay before re-enabling clocks */ msleep (20 );
@@ -1488,6 +1490,7 @@ static int dp_ctrl_deinitialize_mainlink(struct dp_ctrl_private *ctrl) }phy_power_off (phy); +phy_exit (phy);return 0 ;
@@ -1816,12 +1819,16 @@ int dp_ctrl_off_link_stream(struct dp_ctrl *dp_ctrl)struct dp_ctrl_private *ctrl;struct dp_io *dp_io;struct phy *phy; -int ret; +int ret =0 ; ctrl = container_of(dp_ctrl, struct dp_ctrl_private, dp_ctrl); dp_io = &ctrl->parser->io; phy = dp_io->phy; +/* main link is off */ +if (!dp_power_clk_status (ctrl->power,DP_CTRL_PM )) +return ret; +/* set dongle to D3 (power off) mode */ dp_link_psm_config (ctrl->link, &ctrl->panel->link_info, true);
@@ -1894,6 +1901,7 @@ int dp_ctrl_off(struct dp_ctrl *dp_ctrl) }phy_power_off (phy); +phy_exit (phy);DRM_DEBUG_DP ("DP off done\n" );
drivers/gpu/drm/msm/dp/dp_display.c +3 -1
@@ -1327,8 +1327,10 @@ static int dp_pm_suspend(struct device *dev)mutex_lock (&dp->event_mutex); -if (dp->core_initialized == true) +if (dp->core_initialized == true) { +dp_ctrl_off_link_stream (dp->ctrl);dp_display_host_deinit (dp); + } dp->hpd_state =ST_SUSPENDED ;
drivers/gpu/drm/msm/dp/dp_power.c +15 -0
@@ -262,6 +262,21 @@ int dp_power_clk_enable(struct dp_power *dp_power, } dp_power->core_clks_on = true; } + }else { +if (pm_type ==DP_CORE_PM && !dp_power->core_clks_on) { +DRM_DEBUG_DP ("core clks already disabled\n" ); +return 0 ; + } + +if (pm_type ==DP_CTRL_PM && !dp_power->link_clks_on) { +DRM_DEBUG_DP ("links clks already disabled\n" ); +return 0 ; + } + +if (pm_type ==DP_STREAM_PM && !dp_power->stream_clks_on) { +DRM_DEBUG_DP ("pixel clks already disabled\n" ); +return 0 ; + } } rc =dp_power_clk_set_rate (power, pm_type, enable);
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Please add [email protected] next time
Quoting Kuogee Hsieh (2021-06-01 16:50:08)
Quoted 49 lines
Normal DP suspend operation contains two steps, display off followed by dp suspend, to complete system wide suspending cycle if display is up at that time. In this case, DP phy will be powered off at display off. However there is an exception case that depending on the timing of dongle plug in during system wide suspending, sometimes display off procedure may be skipped and dp suspend was called directly. In this case, dp phy is stay at powered on (
phy->power_count= 1) so that at next resume dp driver crash at main link clock enable due to phy is not physically powered on. This patch will calldp_ctrl_off_link_stream()to tear down main link and power off phy atdp_pm_suspend()if main link had been brought up.Changes in V2:
-- stashed changes intodp_ctrl.c
-- addis_phy_onto monitor phy stateChanges in V3:
-- deleteis_phy_on
-- calldp_ctrl_off_link_stream()fromdp_pm_suspend()Fixes 0114f31a2903 ("drm/msm/dp: handle irq_hpd with sink_count = 0 correctly)Signed-off-by Kuogee Hsieh <[email protected]>--- drivers/gpu/drm/msm/dp/dp_ctrl.c | 10 +++++++++- drivers/gpu/drm/msm/dp/dp_display.c | 4 +++- drivers/gpu/drm/msm/dp/dp_power.c | 15 +++++++++++++++ 3 files changed, 27 insertions(+), 2 deletions(-)drivers/gpu/drm/msm/dp/dp_ctrl.c +2
-0@@ -1414,6 +1414,7 @@ void dp_ctrl_host_deinit(struct dp_ctrl *dp_ctrl) phy = dp_io->phy;dp_catalog_ctrl_enable_irq (ctrl->catalog, false); +phy_exit (phy);DRM_DEBUG_DP ("Host deinitialized successfully\n" );@@ -1457,6 +1458,7 @@ static int dp_ctrl_reinitialize_mainlink(struct dp_ctrl_private *ctrl)return ret; }phy_power_off (phy); +/* hw recommended delay before re-enabling clocks */ msleep (20 );
drivers/gpu/drm/msm/dp/dp_ctrl.c static int dp_ctrl_deinitialize_mainlink(struct dp_ctrl_private *ctrl) · line 1496
Quoted 7 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +1
-0@@ -1488,6 +1490,7 @@ static int dp_ctrl_deinitialize_mainlink(struct dp_ctrl_private *ctrl) }phy_power_off (phy); +phy_exit (phy);return 0 ;
None of these hunks are useful. Can we drop them?
drivers/gpu/drm/msm/dp/dp_ctrl.c int dp_ctrl_off_link_stream(struct dp_ctrl *dp_ctrl) · line 1822
Quoted 6 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +1
-1@@ -1816,12 +1819,16 @@ int dp_ctrl_off_link_stream(struct dp_ctrl *dp_ctrl)struct dp_ctrl_private *ctrl;struct dp_io *dp_io;struct phy *phy; -int ret; +int ret =0 ;
Drop this.
drivers/gpu/drm/msm/dp/dp_ctrl.c int dp_ctrl_off_link_stream(struct dp_ctrl *dp_ctrl) · line 1830
Quoted 8 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +3
-0ctrl = container_of(dp_ctrl, struct dp_ctrl_private, dp_ctrl); dp_io = &ctrl->parser->io; phy = dp_io->phy; +/* main link is off */ +if (!dp_power_clk_status (ctrl->power,DP_CTRL_PM )) +return ret;
and then return 0?
drivers/gpu/drm/msm/dp/dp_ctrl.c int dp_ctrl_off(struct dp_ctrl *dp_ctrl) · line 1907
Quoted 12 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +2
-0+/* set dongle to D3 (power off) mode */ dp_link_psm_config (ctrl->link, &ctrl->panel->link_info, true);@@ -1894,6 +1901,7 @@ int dp_ctrl_off(struct dp_ctrl *dp_ctrl) }phy_power_off (phy); +phy_exit (phy);DRM_DEBUG_DP ("DP off done\n" );
Drop?
drivers/gpu/drm/msm/dp/dp_display.c static int dp_pm_suspend(struct device *dev) · line 1331
Quoted 11 lines
drivers/gpu/drm/msm/dp/dp_display.c +2
-1@@ -1327,8 +1327,10 @@ static int dp_pm_suspend(struct device *dev)mutex_lock (&dp->event_mutex); -if (dp->core_initialized == true) +if (dp->core_initialized == true) { +dp_ctrl_off_link_stream (dp->ctrl);
Why not just check here for dp_power_clk_status()?
Quoted 19 lines
drivers/gpu/drm/msm/dp/dp_display.c +1
-0dp_display_host_deinit (dp); + } dp->hpd_state =ST_SUSPENDED ;drivers/gpu/drm/msm/dp/dp_power.c +6
-0@@ -262,6 +262,21 @@ int dp_power_clk_enable(struct dp_power *dp_power, } dp_power->core_clks_on = true; } + }else { +if (pm_type ==DP_CORE_PM && !dp_power->core_clks_on) { +DRM_DEBUG_DP ("core clks already disabled\n" ); +return 0 ; + } +
drivers/gpu/drm/msm/dp/dp_power.c int dp_power_clk_enable(struct dp_power *dp_power, · line 280
Quoted 10 lines
drivers/gpu/drm/msm/dp/dp_power.c +9
-0+if (pm_type ==DP_CTRL_PM && !dp_power->link_clks_on) { +DRM_DEBUG_DP ("links clks already disabled\n" ); +return 0 ; + } + +if (pm_type ==DP_STREAM_PM && !dp_power->stream_clks_on) { +DRM_DEBUG_DP ("pixel clks already disabled\n" ); +return 0 ; + } }
If this happens isn't something wrong? Like we've somehow lost track of the proper state and no we're trying to disable clks when we don't need to. And given that clks already manage their own refcount that would be pretty obvious if it went wrong
Quoted 2 lines
drivers/gpu/drm/msm/dp/dp_power.c +0
-0rc =dp_power_clk_set_rate (power, pm_type, enable);
Quoted 145 lines · Stephen Boyd
Please add [email protected] next time
Quoting Kuogee Hsieh (2021-06-01 16:50:08)
Quoted 58 lines
Normal DP suspend operation contains two steps, display off followed by dp suspend, to complete system wide suspending cycle if display is up at that time. In this case, DP phy will be powered off at display off. However there is an exception case that depending on the timing of dongle plug in during system wide suspending, sometimes display off procedure may be skipped and dp suspend was called directly. In this case, dp phy is stay at powered on (
phy->power_count= 1) so that at next resume dp driver crash at main link clock enable due to phy is not physically powered on. This patch will calldp_ctrl_off_link_stream()to tear down main link and power off phy atdp_pm_suspend()if main link had been brought up.Changes in V2:
-- stashed changes intodp_ctrl.c
-- addis_phy_onto monitor phy stateChanges in V3:
-- deleteis_phy_on
-- calldp_ctrl_off_link_stream()fromdp_pm_suspend()Fixes 0114f31a2903 ("drm/msm/dp: handle irq_hpd with sink_count = 0 correctly)Signed-off-by Kuogee Hsieh <[email protected]>--- drivers/gpu/drm/msm/dp/dp_ctrl.c | 10 +++++++++- drivers/gpu/drm/msm/dp/dp_display.c | 4 +++- drivers/gpu/drm/msm/dp/dp_power.c | 15 +++++++++++++++ 3 files changed, 27 insertions(+), 2 deletions(-)drivers/gpu/drm/msm/dp/dp_ctrl.c +1
-0@@ -1414,6 +1414,7 @@ void dp_ctrl_host_deinit(struct dp_ctrl *dp_ctrl) phy = dp_io->phy;dp_catalog_ctrl_enable_irq (ctrl->catalog, false); +phy_exit (phy);DRM_DEBUG_DP("Host deinitialized successfully\n");drivers/gpu/drm/msm/dp/dp_ctrl.c +2
-0@@ -1457,6 +1458,7 @@ static int dp_ctrl_reinitialize_mainlink(struct dp_ctrl_private *ctrl)return ret; }phy_power_off (phy); +/* hw recommended delay before re-enabling clocks */ msleep (20 );@@ -1488,6 +1490,7 @@ static int dp_ctrl_deinitialize_mainlink(struct dp_ctrl_private *ctrl) }phy_power_off (phy); +phy_exit (phy);Quoted 1 line
return 0;None of these hunks are useful. Can we drop them?
drivers/gpu/drm/msm/dp/dp_ctrl.c int dp_ctrl_off_link_stream(struct dp_ctrl · line 1823
Quoted 7 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +1
-1@@ -1816,12 +1819,16 @@ int dp_ctrl_off_link_stream(struct dp_ctrl *dp_ctrl)struct dp_ctrl_private *ctrl;struct dp_io *dp_io;struct phy *phy; -int ret; +int ret =0 ;Drop this.
drivers/gpu/drm/msm/dp/dp_ctrl.c int dp_ctrl_off_link_stream(struct dp_ctrl *dp_ctrl) · line 1830
Quoted 8 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +3
-0ctrl = container_of(dp_ctrl, struct dp_ctrl_private, dp_ctrl); dp_io = &ctrl->parser->io; phy = dp_io->phy; +/* main link is off */ +if (!dp_power_clk_status (ctrl->power,DP_CTRL_PM )) +return ret;and then return 0?
drivers/gpu/drm/msm/dp/dp_ctrl.c int dp_ctrl_off(struct dp_ctrl *dp_ctrl) · line 1907
Quoted 12 lines
drivers/gpu/drm/msm/dp/dp_ctrl.c +2
-0+/* set dongle to D3 (power off) mode */ dp_link_psm_config (ctrl->link, &ctrl->panel->link_info, true);@@ -1894,6 +1901,7 @@ int dp_ctrl_off(struct dp_ctrl *dp_ctrl) }phy_power_off (phy); +phy_exit (phy);DRM_DEBUG_DP ("DP off done\n" );Drop?
drivers/gpu/drm/msm/dp/dp_display.c static int dp_pm_suspend(struct device *dev) · line 1331
Quoted 11 lines
drivers/gpu/drm/msm/dp/dp_display.c +2
-1@@ -1327,8 +1327,10 @@ static int dp_pm_suspend(struct device *dev)mutex_lock (&dp->event_mutex); -if (dp->core_initialized == true) +if (dp->core_initialized == true) { +dp_ctrl_off_link_stream (dp->ctrl);Why not just check here for
dp_power_clk_status()?Quoted 30 lines
drivers/gpu/drm/msm/dp/dp_display.c +1
-0dp_display_host_deinit (dp); + } dp->hpd_state =ST_SUSPENDED ;drivers/gpu/drm/msm/dp/dp_power.c +12
-0@@ -262,6 +262,21 @@ int dp_power_clk_enable(struct dp_power *dp_power, } dp_power->core_clks_on = true; } + }else { +if (pm_type ==DP_CORE_PM && !dp_power->core_clks_on) { +DRM_DEBUG_DP ("core clks already disabled\n" ); +return 0 ; + } + +if (pm_type ==DP_CTRL_PM && !dp_power->link_clks_on) { +DRM_DEBUG_DP ("links clks already disabled\n" ); +return 0 ; + } + + if (pm_type == DP_STREAM_PM &&!dp_power->stream_clks_on) {
+DRM_DEBUG_DP("pixel clks already disabled\n");
Quoted 8 lines
drivers/gpu/drm/msm/dp/dp_power.c int dp_power_clk_enable(struct dp_power *dp_power, · line 280
Quoted 3 lines
drivers/gpu/drm/msm/dp/dp_power.c +2
-0+return 0 ; + } }If this happens isn't something wrong? Like we've somehow lost track of the proper state and no we're trying to disable clks when we don't need to. And given that clks already manage their own refcount that would be pretty obvious if it went wrong
yes,
The problem is at suspend the link training has been done (link clk had been enabled)
but has no user space frame work response to response display up uevent so that stream clock is not enabled. I will drop this but create a dedicated dp_ctrl_off_link() for suspend purpose.
Quoted 3 lines
Quoted 3 lines
rc = dp_power_clk_set_rate(power, pm_type, enable);