diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/1598-drm-amd-display-add-i2c-over-aux-failure-handling.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/1598-drm-amd-display-add-i2c-over-aux-failure-handling.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/1598-drm-amd-display-add-i2c-over-aux-failure-handling.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/1598-drm-amd-display-add-i2c-over-aux-failure-handling.patch new file mode 100644 index 00000000..225ec621 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/1598-drm-amd-display-add-i2c-over-aux-failure-handling.patch @@ -0,0 +1,48 @@ +From a068866aa3d9c2c0320a52c350329f490cf280ae Mon Sep 17 00:00:00 2001 +From: Wenjing Liu <Wenjing.Liu@amd.com> +Date: Sat, 23 Feb 2019 16:07:45 -0500 +Subject: [PATCH 1598/2940] 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> +--- + drivers/gpu/drm/amd/display/dc/dc_ddc_types.h | 2 ++ + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 2 ++ + 2 files changed, 4 insertions(+) + +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 05c8c31d8b31..4ef97f65e55d 100644 +--- 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 c9b881ddd6b6..cdb3042e1ae1 100644 +--- 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; +-- +2.17.1 + |