Attachment 93781 Details for Bug 71267 – drm/i915/dp: add max retries in native aux

[patch] drm/i915/dp: add max retries in native aux

0001-drm-i915-dp-add-max-retries-in-native-aux.patch (text/plain), 1.99 KB, created by Jani Nikula on 2014-02-10 15:27:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jani Nikula

Created: 2014-02-10 15:27:19 UTC

Size: 1.99 KB

patch

obsolete

>From 68ebc02616bbb4f009545526e8771ef9c78db219 Mon Sep 17 00:00:00 2001
>From: Jani Nikula <jani.nikula@intel.com>
>Date: Mon, 10 Feb 2014 17:29:07 +0200
>Subject: [PATCH] drm/i915/dp: add max retries in native aux
>Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo
>Cc: Jani Nikula <jani.nikula@intel.com>
>
>Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>---
> drivers/gpu/drm/i915/intel_dp.c |   14 ++++++++++++--
> 1 file changed, 12 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
>index f1ef3d482c87..9c9f632680bb 100644
>--- a/drivers/gpu/drm/i915/intel_dp.c
>+++ b/drivers/gpu/drm/i915/intel_dp.c
>@@ -577,6 +577,7 @@ intel_dp_aux_native_write(struct intel_dp *intel_dp,
> 	uint8_t	msg[20];
> 	int msg_bytes;
> 	uint8_t	ack;
>+	int retry;
> 
> 	if (WARN_ON(send_bytes > 16))
> 		return -E2BIG;
>@@ -588,7 +589,7 @@ intel_dp_aux_native_write(struct intel_dp *intel_dp,
> 	msg[3] = send_bytes - 1;
> 	memcpy(&msg[4], send, send_bytes);
> 	msg_bytes = send_bytes + 4;
>-	for (;;) {
>+	for (retry = 0; retry < 10; retry++) {
> 		ret = intel_dp_aux_ch(intel_dp, msg, msg_bytes, &ack, 1);
> 		if (ret < 0)
> 			return ret;
>@@ -600,6 +601,11 @@ intel_dp_aux_native_write(struct intel_dp *intel_dp,
> 		else
> 			return -EIO;
> 	}
>+	if (retry == 10) {
>+		DRM_ERROR("too many retries\n");
>+		return -EIO;
>+	}
>+
> 	return send_bytes;
> }
> 
>@@ -622,6 +628,7 @@ intel_dp_aux_native_read(struct intel_dp *intel_dp,
> 	int reply_bytes;
> 	uint8_t ack;
> 	int ret;
>+	int retry;
> 
> 	if (WARN_ON(recv_bytes > 19))
> 		return -E2BIG;
>@@ -635,7 +642,7 @@ intel_dp_aux_native_read(struct intel_dp *intel_dp,
> 	msg_bytes = 4;
> 	reply_bytes = recv_bytes + 1;
> 
>-	for (;;) {
>+	for (retry = 0; retry < 10; retry++) {
> 		ret = intel_dp_aux_ch(intel_dp, msg, msg_bytes,
> 				      reply, reply_bytes);
> 		if (ret == 0)
>@@ -652,6 +659,9 @@ intel_dp_aux_native_read(struct intel_dp *intel_dp,
> 		else
> 			return -EIO;
> 	}
>+
>+	DRM_ERROR("too many retries\n");
>+	return -EIO;
> }
> 
> static int
>-- 
>1.7.9.5
>

Actions: View | Splinter Review

Attachments on bug 71267: 88694 | 88695 | 88700 | 88748 | 89187 | 89905 | 89906 | 89947 | 90101 | 90102 | 90151 | 91164 | 92490 | 92880 | 92881 | 92882 | 92883 | 93653 | 93654 | 93781 | 93841 | 93842 | 93905 | 93971 | 93972 | 94007

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.