Merge "msm: mdss: dp: fix wdog_bite while disconnecting DP cable" (414269dd) · Commits · e / devices / android_kernel_sony_msm8998

drivers/video/fbdev/msm/mdss_dp.c

+12 −0

Original line number	Diff line number	Diff line
		@@ -2116,6 +2116,12 @@ static int mdss_dp_notify_clients(struct mdss_dp_drv_pdata *dp,
		if (dp->hpd_notification_status == NOTIFY_UNKNOWN)
		goto invalid_request;
		if (dp->hpd_notification_status == NOTIFY_DISCONNECT_IRQ_HPD) {
		/*
		* Just in case if NOTIFY_DISCONNECT_IRQ_HPD is timedout
		*/
		if (dp->power_on)
		mdss_dp_state_ctrl(&dp->ctrl_io, ST_PUSH_IDLE);

		/*
		* user modules already turned off. Need to explicitly
		* turn off DP core here.
		@@ -2997,6 +3003,12 @@ static void mdss_dp_mainlink_push_idle(struct mdss_panel_data *pdata)
		/* wait until link training is completed */
		mutex_lock(&dp_drv->train_mutex);

		if (!dp_drv->power_on) {
		pr_err("DP Controller not powered on\n");
		mutex_unlock(&dp_drv->train_mutex);
		return;
		}

		reinit_completion(&dp_drv->idle_comp);
		mdss_dp_state_ctrl(&dp_drv->ctrl_io, ST_PUSH_IDLE);
		if (!wait_for_completion_timeout(&dp_drv->idle_comp,