1 files changed, 42 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/4785-drm-amd-display-fix-potential-infinite-loop-in-fbc-p.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/4785-drm-amd-display-fix-potential-infinite-loop-in-fbc-p.patch
new file mode 100644
index 00000000..500e1dad
--- /dev/null
+++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/4785-drm-amd-display-fix-potential-infinite-loop-in-fbc-p.patch
@@ -0,0 +1,42 @@
+From 7a13914aacf6b31f699f3eb83b8510884a6426e4 Mon Sep 17 00:00:00 2001
+From: Roman Li <Roman.Li@amd.com>
+Date: Tue, 5 Jun 2018 14:24:53 -0400
+Subject: [PATCH 4785/5725] drm/amd/display: fix potential infinite loop in fbc
+ path
+
+- Fixing integer overflow bug in wait_for_fbc_state_changed()
+- Correct the max value of retries for the corresponding warning
+
+Signed-off-by: Roman Li <Roman.Li@amd.com>
+Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
+Acked-by: Harry Wentland <harry.wentland@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/display/dc/dce110/dce110_compressor.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_compressor.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_compressor.c
+index df02701..1f7f250 100644
+--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_compressor.c
++++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_compressor.c
+@@ -143,7 +143,7 @@ static void wait_for_fbc_state_changed(
+ 	struct dce110_compressor *cp110,
+ 	bool enabled)
+ {
+-	uint16_t counter = 0;
++	uint32_t counter = 0;
+ 	uint32_t addr = mmFBC_STATUS;
+ 	uint32_t value;
+ 
+@@ -158,7 +158,7 @@ static void wait_for_fbc_state_changed(
+ 		counter++;
+ 	}
+ 
+-	if (counter == 10) {
++	if (counter == 1000) {
+ 		DC_LOG_WARNING("%s: wait counter exceeded, changes to HW not applied",
+ 			__func__);
+ 	} else {
+-- 
+2.7.4
+