|
@@ -4065,6 +4065,7 @@ int intel_dp_sink_crc(struct intel_dp *intel_dp, u8 *crc)
|
|
|
u8 buf;
|
|
|
int count, ret;
|
|
|
int attempts = 6;
|
|
|
+ bool old_equal_new;
|
|
|
|
|
|
ret = intel_dp_sink_crc_start(intel_dp);
|
|
|
if (ret)
|
|
@@ -4079,6 +4080,7 @@ int intel_dp_sink_crc(struct intel_dp *intel_dp, u8 *crc)
|
|
|
goto stop;
|
|
|
}
|
|
|
count = buf & DP_TEST_COUNT_MASK;
|
|
|
+
|
|
|
/*
|
|
|
* Count might be reset during the loop. In this case
|
|
|
* last known count needs to be reset as well.
|
|
@@ -4090,17 +4092,24 @@ int intel_dp_sink_crc(struct intel_dp *intel_dp, u8 *crc)
|
|
|
ret = -EIO;
|
|
|
goto stop;
|
|
|
}
|
|
|
- } while (--attempts && (count == 0 || (count == intel_dp->sink_crc.last_count &&
|
|
|
- !memcmp(intel_dp->sink_crc.last_crc, crc,
|
|
|
- 6 * sizeof(u8)))));
|
|
|
+
|
|
|
+ old_equal_new = (count == intel_dp->sink_crc.last_count &&
|
|
|
+ !memcmp(intel_dp->sink_crc.last_crc, crc,
|
|
|
+ 6 * sizeof(u8)));
|
|
|
+
|
|
|
+ } while (--attempts && (count == 0 || old_equal_new));
|
|
|
|
|
|
intel_dp->sink_crc.last_count = buf & DP_TEST_COUNT_MASK;
|
|
|
memcpy(intel_dp->sink_crc.last_crc, crc, 6 * sizeof(u8));
|
|
|
|
|
|
if (attempts == 0) {
|
|
|
- DRM_DEBUG_KMS("Panel is unable to calculate CRC after 6 vblanks\n");
|
|
|
- ret = -ETIMEDOUT;
|
|
|
- goto stop;
|
|
|
+ if (old_equal_new) {
|
|
|
+ DRM_DEBUG_KMS("Unreliable Sink CRC counter: Current returned CRC is identical to the previous one\n");
|
|
|
+ } else {
|
|
|
+ DRM_ERROR("Panel is unable to calculate any CRC after 6 vblanks\n");
|
|
|
+ ret = -ETIMEDOUT;
|
|
|
+ goto stop;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
stop:
|