1 files changed, 44 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3594-drm-amd-display-Use-res_cap-to-acquire-i2c-instead-o.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3594-drm-amd-display-Use-res_cap-to-acquire-i2c-instead-o.patch
new file mode 100644
index 00000000..e2461550
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3594-drm-amd-display-Use-res_cap-to-acquire-i2c-instead-o.patch
@@ -0,0 +1,44 @@
+From 9bab5696b2902728416cc43423188acb7c8b18ed Mon Sep 17 00:00:00 2001
+From: Derek Lai <Derek.Lai@amd.com>
+Date: Fri, 2 Aug 2019 16:33:32 +0800
+Subject: [PATCH 3594/4256] drm/amd/display: Use res_cap to acquire i2c instead
+ of pipe count
+
+[Why]
+We should be using the ddc_num from res_caps. As the
+pipe count != number of i2c resources.
+
+[How]
+Use ddc_num from res_cap instead of pipe count.
+
+Signed-off-by: Derek Lai <Derek.Lai@amd.com>
+Reviewed-by: Charlene Liu <Charlene.Liu@amd.com>
+Acked-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
+---
+ drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c b/drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c
+index caace5229826..0495a1b5dd74 100644
+--- a/drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c
++++ b/drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c
+@@ -22,6 +22,7 @@
+  * Authors: AMD
+  *
+  */
++#include "resource.h"
+ #include "dce_i2c.h"
+ #include "dce_i2c_hw.h"
+ #include "reg_helper.h"
+@@ -387,7 +388,7 @@ struct dce_i2c_hw *acquire_i2c_hw_engine(
+ 	if (ddc->hw_info.hw_supported) {
+ 		enum gpio_ddc_line line = dal_ddc_get_line(ddc);
+ 
+-		if (line < pool->pipe_count)
++		if (line < pool->res_cap->num_ddc)
+ 			dce_i2c_hw = pool->hw_i2cs[line];
+ 	}
+ 
+-- 
+2.17.1
+