drm/amd/display: Rename constant
authorWesley Chalmers <Wesley.Chalmers@amd.com>
Tue, 30 Mar 2021 16:56:13 +0000 (12:56 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 15 Jun 2021 21:25:41 +0000 (17:25 -0400)
[WHY]
7 is the minimum number of retries TX must attempt on an AUX DEFER, not
the maximum.

Signed-off-by: Wesley Chalmers <Wesley.Chalmers@amd.com>
Reviewed-by: Jun Lei <Jun.Lei@amd.com>
Acked-by: Anson Jacob <Anson.Jacob@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/dce/dce_aux.c

index 83d97df..9d5e09b 100644 (file)
@@ -615,7 +615,7 @@ int dce_aux_transfer_dmub_raw(struct ddc_service *ddc,
 }
 
 #define AUX_MAX_RETRIES 7
-#define AUX_MAX_DEFER_RETRIES 7
+#define AUX_MIN_DEFER_RETRIES 7
 #define AUX_MAX_I2C_DEFER_RETRIES 7
 #define AUX_MAX_INVALID_REPLY_RETRIES 2
 #define AUX_MAX_TIMEOUT_RETRIES 3
@@ -664,7 +664,7 @@ bool dce_aux_transfer_with_retries(struct ddc_service *ddc,
                                retry_on_defer = true;
                                fallthrough;
                        case AUX_TRANSACTION_REPLY_I2C_OVER_AUX_NACK:
-                               if (++aux_defer_retries >= AUX_MAX_DEFER_RETRIES) {
+                               if (++aux_defer_retries >= AUX_MIN_DEFER_RETRIES) {
                                        goto fail;
                                } else {
                                        if ((*payload->reply == AUX_TRANSACTION_REPLY_AUX_DEFER) ||
@@ -701,7 +701,7 @@ bool dce_aux_transfer_with_retries(struct ddc_service *ddc,
                        // Check whether a DEFER had occurred before the timeout.
                        // If so, treat timeout as a DEFER.
                        if (retry_on_defer) {
-                               if (++aux_defer_retries >= AUX_MAX_DEFER_RETRIES)
+                               if (++aux_defer_retries >= AUX_MIN_DEFER_RETRIES)
                                        goto fail;
                                else if (payload->defer_delay > 0)
                                        msleep(payload->defer_delay);