Changes in V2: -- correct Fixes text -- drop commit text
Fixes: 601f0479c583 ("drm/msm/dp: add logs across DP driver for ease of debugging") Signed-off-by: Kuogee Hsieh khsieh@codeaurora.org --- drivers/gpu/drm/msm/dp/dp_display.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c index 8a85613..870b926 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -1284,6 +1284,9 @@ static int dp_pm_resume(struct device *dev)
mutex_lock(&dp->event_mutex);
+ DRM_DEBUG_DP("Before, core_inited=%d power_on=%d\n", + dp->core_initialized, dp_display->power_on); + /* start from disconnected state */ dp->hpd_state = ST_DISCONNECTED;
@@ -1315,6 +1318,10 @@ static int dp_pm_resume(struct device *dev) else dp->dp_display.is_connected = false;
+ DRM_DEBUG_DP("After, sink_count=%d is_connected=%d core_inited=%d power_on=%d\n", + dp->link->sink_count, dp->dp_display.is_connected, + dp->core_initialized, dp_display->power_on); + mutex_unlock(&dp->event_mutex);
return 0; @@ -1330,6 +1337,9 @@ static int dp_pm_suspend(struct device *dev)
mutex_lock(&dp->event_mutex);
+ DRM_DEBUG_DP("Before, core_inited=%d power_on=%d\n", + dp->core_initialized, dp_display->power_on); + if (dp->core_initialized == true) { /* mainlink enabled */ if (dp_power_clk_status(dp->power, DP_CTRL_PM)) @@ -1343,6 +1353,9 @@ static int dp_pm_suspend(struct device *dev) /* host_init will be called at pm_resume */ dp->core_initialized = false;
+ DRM_DEBUG_DP("After, core_inited=%d power_on=%d\n", + dp->core_initialized, dp_display->power_on); + mutex_unlock(&dp->event_mutex);
return 0;
Quoting Kuogee Hsieh (2021-08-10 08:29:22)
Changes in V2: -- correct Fixes text -- drop commit text
Fixes: 601f0479c583 ("drm/msm/dp: add logs across DP driver for ease of debugging") Signed-off-by: Kuogee Hsieh khsieh@codeaurora.org
Reviewed-by: Stephen Boyd swboyd@chromium.org
Quoting Kuogee Hsieh (2021-08-10 08:29:22)
Changes in V2: -- correct Fixes text -- drop commit text
Fixes: 601f0479c583 ("drm/msm/dp: add logs across DP driver for ease of debugging") Signed-off-by: Kuogee Hsieh khsieh@codeaurora.org
drivers/gpu/drm/msm/dp/dp_display.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
BTW, this conflicts with commit e8a767e04dbc7b201cb17ab99dca723a3488b6d4 in msm-next. The resolution is trivial but just wanted to mention it.
On 2021-08-10 11:33, Stephen Boyd wrote:
Quoting Kuogee Hsieh (2021-08-10 08:29:22)
Changes in V2: -- correct Fixes text -- drop commit text
Fixes: 601f0479c583 ("drm/msm/dp: add logs across DP driver for ease of debugging") Signed-off-by: Kuogee Hsieh khsieh@codeaurora.org
drivers/gpu/drm/msm/dp/dp_display.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
BTW, this conflicts with commit e8a767e04dbc7b201cb17ab99dca723a3488b6d4 in msm-next. The resolution is trivial but just wanted to mention it.
I Just fetched msm-next and cherry-pick this patch over, no conflict seen. Is this conflict need to be fixed?
Quoting khsieh@codeaurora.org (2021-08-10 12:18:02)
On 2021-08-10 11:33, Stephen Boyd wrote:
Quoting Kuogee Hsieh (2021-08-10 08:29:22)
Changes in V2: -- correct Fixes text -- drop commit text
Fixes: 601f0479c583 ("drm/msm/dp: add logs across DP driver for ease of debugging") Signed-off-by: Kuogee Hsieh khsieh@codeaurora.org
drivers/gpu/drm/msm/dp/dp_display.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
BTW, this conflicts with commit e8a767e04dbc7b201cb17ab99dca723a3488b6d4 in msm-next. The resolution is trivial but just wanted to mention it.
I Just fetched msm-next and cherry-pick this patch over, no conflict seen. Is this conflict need to be fixed?
Oh sorry, I mean commit afc9b8b6bab8 ("drm/msm/dp: signal audio plugged change at dp_pm_resume") which doesn't seem to be in msm-next. Maybe Rob will resolve the conflict directly.
On 2021-08-10 12:23, Stephen Boyd wrote:
Quoting khsieh@codeaurora.org (2021-08-10 12:18:02)
On 2021-08-10 11:33, Stephen Boyd wrote:
Quoting Kuogee Hsieh (2021-08-10 08:29:22)
Changes in V2: -- correct Fixes text -- drop commit text
Fixes: 601f0479c583 ("drm/msm/dp: add logs across DP driver for ease of debugging") Signed-off-by: Kuogee Hsieh khsieh@codeaurora.org
drivers/gpu/drm/msm/dp/dp_display.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
BTW, this conflicts with commit e8a767e04dbc7b201cb17ab99dca723a3488b6d4 in msm-next. The resolution is trivial but just wanted to mention it.
I Just fetched msm-next and cherry-pick this patch over, no conflict seen. Is this conflict need to be fixed?
Oh sorry, I mean commit afc9b8b6bab8 ("drm/msm/dp: signal audio plugged change at dp_pm_resume") which doesn't seem to be in msm-next. Maybe Rob will resolve the conflict directly.
Yes, I just found that commit afc9b8b6bab8 ("drm/msm/dp: signal audio plugged
change at dp_pm_resume") is not merged in msm-next.
dri-devel@lists.freedesktop.org