Merge "msm: mdss: hdmi: fix HDCP1.4 authentication issues" (7daf09b9) · Commits · e / devices / android_kernel_sony_msm8998

drivers/video/fbdev/msm/mdss_hdcp_1x.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -1353,8 +1353,10 @@ static int hdcp_1x_authentication_part2(struct hdcp_1x *hdcp)
		goto error;

		/* do not proceed further if no device connected */
		if (!hdcp->current_tp.dev_count)
		if (!hdcp->current_tp.dev_count) {
		rc = -EINVAL;
		goto error;
		}

		rc = hdcp_1x_write_ksv_fifo(hdcp);
		} while (--v_retry && rc);
		@@ -1461,7 +1463,7 @@ static void hdcp_1x_auth_work(struct work_struct *work)
		goto end;
		} else {
		hdcp->hdcp_state = HDCP_STATE_AUTHENTICATED;
		goto end;
		goto disable_sw_ddc;
		}

		hdcp->ksv_ready = false;
		@@ -1470,6 +1472,7 @@ static void hdcp_1x_auth_work(struct work_struct *work)
		if (rc)
		goto end;

		disable_sw_ddc:
		/*
		* Disabling software DDC before going into part3 to make sure
		* there is no Arbitration between software and hardware for DDC