Merge "drm/msm/dp: fix handling of HDCP 1.x read/write transactions" (8bb97063) · Commits · e / devices / android_kernel_fairphone_FP3

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -498,7 +498,7 @@ static int dp_display_send_hpd_notification(struct dp_display_private *dp,
		reinit_completion(&dp->notification_comp);
		dp_display_send_hpd_event(&dp->dp_display);

		if (!wait_for_completion_timeout(&dp->notification_comp, HZ * 2)) {
		if (!wait_for_completion_timeout(&dp->notification_comp, HZ * 5)) {
		pr_warn("%s timeout\n", hpd ? "connect" : "disconnect");
		return -EINVAL;
		}

+5 −1

Original line number	Diff line number	Diff line
		@@ -363,12 +363,15 @@ static int sde_hdcp_1x_read(struct sde_hdcp_1x *hdcp,
		if (bytes_read != read_size) {
		pr_err("fail: offset(0x%x), size(0x%x), rc(0x%x)\n",
		offset, read_size, bytes_read);
		rc = -EIO;
		break;
		}

		buf += read_size;
		offset += read_size;
		size -= read_size;

		if (!realign)
		offset += read_size;
		} while (size > 0);
		}

		@@ -393,6 +396,7 @@ static int sde_hdcp_1x_write(struct sde_hdcp_1x *hdcp,
		if (bytes_written != write_size) {
		pr_err("fail: offset(0x%x), size(0x%x), rc(0x%x)\n",
		offset, write_size, bytes_written);
		rc = -EIO;
		break;
		}