[PATCH] drm/i915: make sink_crc return -EIO on aux read/write failure

[PATCH] drm/i915: make sink_crc return -EIO on aux read/write failure

[Rodrigo Vivi]

Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Todd Previte <tprevite@gmail.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 drivers/gpu/drm/i915/intel_dp.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index ad4eb6d..8ead695 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -3868,16 +3868,21 @@ int intel_dp_sink_crc(struct intel_dp *intel_dp, u8 *crc)
 	if (!(buf & DP_TEST_CRC_SUPPORTED))
 		return -ENOTTY;
 
-	drm_dp_dpcd_readb(&intel_dp->aux, DP_TEST_SINK, &buf);
+	if (drm_dp_dpcd_readb(&intel_dp->aux, DP_TEST_SINK, &buf) < 0)
+		return -EIO;
+
 	if (drm_dp_dpcd_writeb(&intel_dp->aux, DP_TEST_SINK,
 				buf | DP_TEST_SINK_START) < 0)
 		return -EIO;
 
-	drm_dp_dpcd_readb(&intel_dp->aux, DP_TEST_SINK_MISC, &buf);
+	if (drm_dp_dpcd_readb(&intel_dp->aux, DP_TEST_SINK_MISC, &buf) < 0)
+		return -EIO;
 	test_crc_count = buf & DP_TEST_COUNT_MASK;
 
 	do {
-		drm_dp_dpcd_readb(&intel_dp->aux, DP_TEST_SINK_MISC, &buf);
+		if (drm_dp_dpcd_readb(&intel_dp->aux,
+				      DP_TEST_SINK_MISC, &buf) < 0)
+			return -EIO;
 		intel_wait_for_vblank(dev, intel_crtc->pipe);
 	} while (--attempts && (buf & DP_TEST_COUNT_MASK) == test_crc_count);
 
@@ -3889,9 +3894,11 @@ int intel_dp_sink_crc(struct intel_dp *intel_dp, u8 *crc)
 	if (drm_dp_dpcd_read(&intel_dp->aux, DP_TEST_CRC_R_CR, crc, 6) < 0)
 		return -EIO;
 
-	drm_dp_dpcd_readb(&intel_dp->aux, DP_TEST_SINK, &buf);
-	drm_dp_dpcd_writeb(&intel_dp->aux, DP_TEST_SINK,
-			buf & ~DP_TEST_SINK_START);
+	if (drm_dp_dpcd_readb(&intel_dp->aux, DP_TEST_SINK, &buf) < 0)
+		return -EIO;
+	if (drm_dp_dpcd_writeb(&intel_dp->aux, DP_TEST_SINK,
+			       buf & ~DP_TEST_SINK_START) < 0)
+		return -EIO;
 
 	return 0;
 }
-- 
1.9.3

Re: [PATCH] drm/i915: make sink_crc return -EIO on aux read/write failure

[Daniel Vetter]

On Wed, Oct 01, 2014 at 07:32:37AM -0700, Rodrigo Vivi wrote:

Nothing is usually to little commit message. I've fixed this while
applying.

> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Cc: Todd Previte <tprevite@gmail.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

Queued for -next, thanks for the patch.
-Daniel

> ---
>  drivers/gpu/drm/i915/intel_dp.c | 19 +++++++++++++------
>  1 file changed, 13 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index ad4eb6d..8ead695 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -3868,16 +3868,21 @@ int intel_dp_sink_crc(struct intel_dp *intel_dp, u8 *crc)
>  	if (!(buf & DP_TEST_CRC_SUPPORTED))
>  		return -ENOTTY;
>  
> -	drm_dp_dpcd_readb(&intel_dp->aux, DP_TEST_SINK, &buf);
> +	if (drm_dp_dpcd_readb(&intel_dp->aux, DP_TEST_SINK, &buf) < 0)
> +		return -EIO;
> +
>  	if (drm_dp_dpcd_writeb(&intel_dp->aux, DP_TEST_SINK,
>  				buf | DP_TEST_SINK_START) < 0)
>  		return -EIO;
>  
> -	drm_dp_dpcd_readb(&intel_dp->aux, DP_TEST_SINK_MISC, &buf);
> +	if (drm_dp_dpcd_readb(&intel_dp->aux, DP_TEST_SINK_MISC, &buf) < 0)
> +		return -EIO;
>  	test_crc_count = buf & DP_TEST_COUNT_MASK;
>  
>  	do {
> -		drm_dp_dpcd_readb(&intel_dp->aux, DP_TEST_SINK_MISC, &buf);
> +		if (drm_dp_dpcd_readb(&intel_dp->aux,
> +				      DP_TEST_SINK_MISC, &buf) < 0)
> +			return -EIO;
>  		intel_wait_for_vblank(dev, intel_crtc->pipe);
>  	} while (--attempts && (buf & DP_TEST_COUNT_MASK) == test_crc_count);
>  
> @@ -3889,9 +3894,11 @@ int intel_dp_sink_crc(struct intel_dp *intel_dp, u8 *crc)
>  	if (drm_dp_dpcd_read(&intel_dp->aux, DP_TEST_CRC_R_CR, crc, 6) < 0)
>  		return -EIO;
>  
> -	drm_dp_dpcd_readb(&intel_dp->aux, DP_TEST_SINK, &buf);
> -	drm_dp_dpcd_writeb(&intel_dp->aux, DP_TEST_SINK,
> -			buf & ~DP_TEST_SINK_START);
> +	if (drm_dp_dpcd_readb(&intel_dp->aux, DP_TEST_SINK, &buf) < 0)
> +		return -EIO;
> +	if (drm_dp_dpcd_writeb(&intel_dp->aux, DP_TEST_SINK,
> +			       buf & ~DP_TEST_SINK_START) < 0)
> +		return -EIO;
>  
>  	return 0;
>  }
> -- 
> 1.9.3
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch