From: Abhinav Kumar <[email protected]> For DP MST, the link clock and power domain resources stay on until both streams have been disabled OR we receive hotplug. Introduce an active_stream_cnt to track the number of active streams and necessary state handling. Replace the power_on variable with active_stream_cnt as power_on boolean works only for a single stream.
Signed-off-by: Abhinav Kumar <[email protected]> --- drivers/gpu/drm/msm/dp/dp_audio.c | 2 +- drivers/gpu/drm/msm/dp/dp_display.c | 42 ++++++++++++++++++++++++------------- drivers/gpu/drm/msm/dp/dp_display.h | 3 ++- 3 files changed, 31 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/msm/dp/dp_audio.c b/drivers/gpu/drm/msm/dp/dp_audio.c index f8bfb908f9b4bf93ad5480f0785e3aed23dde160..ba9ec1fb7c4d70d0f544fe5876d57290aab6e2c9 100644 --- a/drivers/gpu/drm/msm/dp/dp_audio.c +++ b/drivers/gpu/drm/msm/dp/dp_audio.c @@ -192,7 +192,7 @@ int msm_dp_audio_prepare(struct drm_connector *connector, * such cases check for connection status and bail out if not * connected. */ - if (!msm_dp_display->power_on) { + if (!msm_dp_display_get_active_stream_cnt(msm_dp_display)) { rc = -EINVAL; goto end; } diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c index ea6113d1138b382f69d726cb16ceb04d82cbbe3b..5c8b38babc778f3575ab26ae4238b5f9fdb65b51 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -111,6 +111,8 @@ struct msm_dp_display_private { bool wide_bus_supported; + u32 active_stream_cnt; + struct msm_dp_audio *audio; int max_stream; }; @@ -189,6 +191,15 @@ static const struct of_device_id msm_dp_dt_match[] = { {} }; +int msm_dp_display_get_active_stream_cnt(struct msm_dp *msm_dp) +{ + struct msm_dp_display_private *msm_dp_display; + + msm_dp_display = container_of(msm_dp, struct msm_dp_display_private, msm_dp_display); + + return msm_dp_display->active_stream_cnt; +} + static struct msm_dp_display_private *dev_get_dp_display_private(struct device *dev) { struct msm_dp *dp = dev_get_drvdata(dev); @@ -679,7 +690,7 @@ static int msm_dp_hpd_unplug_handle(struct msm_dp_display_private *dp, u32 data) */ msm_dp_display_notify_disconnect(&dp->msm_dp_display.pdev->dev); - if (!dp->msm_dp_display.power_on) { + if (!dp->active_stream_cnt) { dp->hpd_state = ST_DISCONNECTED; } else { dp->hpd_state = ST_DISCONNECT_PENDING; @@ -854,7 +865,7 @@ static int msm_dp_display_prepare(struct msm_dp_display_private *dp) return rc; } - if (dp->hpd_state == ST_CONNECTED && !msm_dp_display->power_on) { + if (dp->hpd_state == ST_CONNECTED && !dp->active_stream_cnt) { msm_dp_display_host_phy_init(dp); force_link_train = true; } @@ -870,17 +881,10 @@ static int msm_dp_display_enable(struct msm_dp_display_private *dp, struct msm_dp_panel *msm_dp_panel) { int rc = 0; - struct msm_dp *msm_dp_display = &dp->msm_dp_display; drm_dbg_dp(dp->drm_dev, "sink_count=%d\n", dp->link->sink_count); - if (msm_dp_display->power_on) { - drm_dbg_dp(dp->drm_dev, "Link already setup, return\n"); - return 0; - } rc = msm_dp_ctrl_on_stream(dp->ctrl, msm_dp_panel, dp->max_stream); - if (!rc) - msm_dp_display->power_on = true; return rc; } @@ -927,16 +931,14 @@ static void msm_dp_display_audio_notify_disable(struct msm_dp_display_private *d static int msm_dp_display_disable(struct msm_dp_display_private *dp, struct msm_dp_panel *msm_dp_panel) { - struct msm_dp *msm_dp_display = &dp->msm_dp_display; - - if (!msm_dp_display->power_on) + if (!dp->active_stream_cnt) return 0; msm_dp_ctrl_clear_vsc_sdp_pkt(dp->ctrl, msm_dp_panel); msm_dp_ctrl_off_pixel_clk(dp->ctrl, dp->panel->stream_id); - msm_dp_display->power_on = false; + dp->active_stream_cnt--; drm_dbg_dp(dp->drm_dev, "sink count: %d\n", dp->link->sink_count); return 0; @@ -1076,7 +1078,7 @@ void msm_dp_snapshot(struct msm_disp_state *disp_state, struct msm_dp *dp) */ mutex_lock(&msm_dp_display->event_mutex); - if (!dp->power_on) { + if (!msm_dp_display->active_stream_cnt) { mutex_unlock(&msm_dp_display->event_mutex); return; } @@ -1608,6 +1610,8 @@ void msm_dp_display_enable_helper(struct msm_dp *dp, struct msm_dp_panel *msm_dp } } + msm_dp_display->active_stream_cnt++; + /* completed connection */ msm_dp_display->hpd_state = ST_CONNECTED; @@ -1632,6 +1636,11 @@ void msm_dp_display_disable_helper(struct msm_dp *dp, struct msm_dp_panel *msm_d msm_dp_display = container_of(dp, struct msm_dp_display_private, msm_dp_display); + if (!msm_dp_display->active_stream_cnt) { + drm_dbg_dp(dp->drm_dev, "no active streams\n"); + return; + } + if (msm_dp_display->mst_supported) msm_dp_ctrl_push_vcpf(msm_dp_display->ctrl, msm_dp_panel); else @@ -1664,6 +1673,11 @@ void msm_dp_display_unprepare(struct msm_dp *msm_dp) return; } + if (msm_dp_display->active_stream_cnt) { + drm_dbg_dp(msm_dp->drm_dev, "stream still active, return\n"); + return; + } + /* dongle is still connected but sinks are disconnected */ if (msm_dp_display->link->sink_count == 0) msm_dp_ctrl_psm_config(msm_dp_display->ctrl); diff --git a/drivers/gpu/drm/msm/dp/dp_display.h b/drivers/gpu/drm/msm/dp/dp_display.h index 0b73087cbc421b4d2b895033f17892189ef68cb2..7b0efa342aaf878f3ae7315cb55902bf8bdcb6b9 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.h +++ b/drivers/gpu/drm/msm/dp/dp_display.h @@ -18,7 +18,6 @@ struct msm_dp { struct drm_bridge *next_bridge; bool link_ready; bool audio_enabled; - bool power_on; bool prepared; bool mst_active; unsigned int connector_type; @@ -60,4 +59,6 @@ void msm_dp_display_atomic_post_disable_helper(struct msm_dp *msm_dp, void msm_dp_display_unprepare(struct msm_dp *dp); +int msm_dp_display_get_active_stream_cnt(struct msm_dp *msm_dp); + #endif /* _DP_DISPLAY_H_ */ -- 2.34.1
