From: Abhinav Kumar <[email protected]> msm_dp_hpd_unplug_handle() checks if the display was already disabled and if so does not transition to ST_DISCONNECT_PENDING state and goes directly to ST_DISCONNECTED. The same result can be achieved with the !power_on check.
Replace ST_DISPLAY_OFF with !power_on to achieve the same outcome. Signed-off-by: Abhinav Kumar <[email protected]> Reviewed-by: Dmitry Baryshkov <[email protected]> Signed-off-by: Jessica Zhang <[email protected]> --- drivers/gpu/drm/msm/dp/dp_display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c index f2820f06f5dc..785c813d2b31 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -672,7 +672,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 (state == ST_DISPLAY_OFF) { + if (!dp->msm_dp_display.power_on) { dp->hpd_state = ST_DISCONNECTED; } else { dp->hpd_state = ST_DISCONNECT_PENDING; -- 2.49.0
