Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe93d00c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/dp: check for sink count before enabling post_open callback"

parents 7996883d b62fd6e6

drivers/gpu/drm/msm/dp/dp_display.c

+4 −2
Original line number Diff line number Diff line
@@ -1182,7 +1182,8 @@ static int dp_display_pre_disable(struct dp_display *dp_display) 
			dp->hdcp.ops->off(dp->hdcp.data);

	}



	if (dp->usbpd->hpd_high && dp->usbpd->alt_mode_cfg_done) {

	if (dp->usbpd->hpd_high && !dp_display_is_sink_count_zero(dp) &&

		dp->usbpd->alt_mode_cfg_done) {

		if (dp->audio_supported)

			dp->audio->off(dp->audio);
@@ -1235,7 +1236,8 @@ static int dp_display_disable(struct dp_display *dp_display) 
	 * any notification from driver. Initialize post_open callback to notify

	 * DP connection once framework restarts.

	 */

	if (dp->usbpd->hpd_high && dp->usbpd->alt_mode_cfg_done)

	if (dp->usbpd->hpd_high && !dp_display_is_sink_count_zero(dp) &&

		dp->usbpd->alt_mode_cfg_done)

		dp_display->post_open = dp_display_post_open;



	dp->power_on = false;