From: Rob Clark Date: Sun, 10 Dec 2023 18:07:54 +0000 (-0800) Subject: Merge remote-tracking branch 'drm-misc/drm-misc-next' into msm-next X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=cbaf84e73811ed0ff7ff6d7f52b73fd7ed082d65;p=linux.git Merge remote-tracking branch 'drm-misc/drm-misc-next' into msm-next Backmerge drm-misc-next to pick up some dependencies for drm/msm patches, in particular: https://patchwork.freedesktop.org/patch/570219/?series=127251&rev=1 https://patchwork.freedesktop.org/series/123411/ Signed-off-by: Rob Clark --- cbaf84e73811ed0ff7ff6d7f52b73fd7ed082d65 diff --cc drivers/gpu/drm/msm/dp/dp_display.c index f8a9e8403c264,1b88fb52726f2..0405ff08d7622 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@@ -337,12 -365,14 +337,14 @@@ static int dp_display_send_hpd_notifica /* reset video pattern flag on disconnect */ if (!hpd) { dp->panel->video_test = false; - drm_dp_set_subconnector_property(dp->dp_display.connector, - connector_status_disconnected, - dp->panel->dpcd, dp->panel->downstream_ports); + if (!dp->dp_display.is_edp) + drm_dp_set_subconnector_property(dp->dp_display.connector, + connector_status_disconnected, + dp->panel->dpcd, + dp->panel->downstream_ports); } - dp->dp_display.is_connected = hpd; + dp->dp_display.link_ready = hpd; drm_dbg_dp(dp->drm_dev, "type=%d hpd=%d\n", dp->dp_display.connector_type, hpd);