drm/amd/display: add i2c over aux failure handling

[why]
We will not retry when EDID read failure using i2c over aux

[how]
treat i2c over aux failure the same as defer

Signed-off-by: Wenjing Liu <Wenjing.Liu@amd.com>
Reviewed-by: David Francis <David.Francis@amd.com>
Acked-by: Leo Li <sunpeng.li@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/dc_ddc_types.h b/drivers/gpu/drm/amd/display/dc/dc_ddc_types.h
index 05c8c31d8b310c1324dbe69c31638a991c1e8a4d..4ef97f65e55ddc8bf6c877317ff537cf97dc8f9c 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc_ddc_types.h
+++ b/drivers/gpu/drm/amd/display/dc/dc_ddc_types.h
@@ -68,6 +68,8 @@ enum aux_transaction_reply {
        AUX_TRANSACTION_REPLY_AUX_ACK = 0x00,
        AUX_TRANSACTION_REPLY_AUX_NACK = 0x01,
        AUX_TRANSACTION_REPLY_AUX_DEFER = 0x02,
+       AUX_TRANSACTION_REPLY_I2C_OVER_AUX_NACK = 0x04,
+       AUX_TRANSACTION_REPLY_I2C_OVER_AUX_DEFER = 0x08,
 
        AUX_TRANSACTION_REPLY_I2C_ACK = 0x00,
        AUX_TRANSACTION_REPLY_I2C_NACK = 0x10,

diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_aux.c b/drivers/gpu/drm/amd/display/dc/dce/dce_aux.c
index c9b881ddd6b67e95bbdaac4690a9625dd6bac07c..cdb3042e1ae18f9528813f9e277c7766714f93cd 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_aux.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_aux.c
@@ -528,6 +528,8 @@ bool dce_aux_transfer_with_retries(struct ddc_service *ddc,
                        break;
 
                        case AUX_TRANSACTION_REPLY_AUX_DEFER:
+                       case AUX_TRANSACTION_REPLY_I2C_OVER_AUX_NACK:
+                       case AUX_TRANSACTION_REPLY_I2C_OVER_AUX_DEFER:
                                if (++aux_defer_retries >= AUX_MAX_DEFER_RETRIES)
                                        goto fail;
                                break;