Merge "drm/msm/dp: handle DisplayPort ON/OFF during PM suspend/resume" (e7438561) · Commits · e / devices / android_kernel_fairphone_FP3

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

+8 −4

Original line number	Diff line number	Diff line
		@@ -816,7 +816,7 @@ static void dp_display_connect_work(struct work_struct *work)
		struct dp_display_private *dp = container_of(dw,
		struct dp_display_private, connect_work);

		if (dp->dp_display.is_connected) {
		if (dp->dp_display.is_connected && dp_display_framework_ready(dp)) {
		pr_debug("HPD already on\n");
		return;
		}
		@@ -1085,6 +1085,11 @@ static int dp_display_enable(struct dp_display *dp_display)

		dp->aux->init(dp->aux, dp->parser->aux_cfg);

		if (dp->debug->psm_enabled) {
		dp->link->psm_config(dp->link, &dp->panel->link_info, false);
		dp->debug->psm_enabled = false;
		}

		rc = dp->ctrl->on(dp->ctrl);

		if (dp->debug->tpg_state)
		@@ -1227,10 +1232,9 @@ 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->usbpd->alt_mode_cfg_done)
		dp_display->post_open = dp_display_post_open;
		dp->dp_display.is_connected = false;
		}

		dp->power_on = false;
		dp->aux->state = DP_STATE_CTRL_POWERED_OFF;
		end: