aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0651-drm-amd-display-Fix-generic_reg_wait-1000ms-case.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0651-drm-amd-display-Fix-generic_reg_wait-1000ms-case.patch')
-rw-r--r--meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0651-drm-amd-display-Fix-generic_reg_wait-1000ms-case.patch35
1 files changed, 35 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0651-drm-amd-display-Fix-generic_reg_wait-1000ms-case.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0651-drm-amd-display-Fix-generic_reg_wait-1000ms-case.patch
new file mode 100644
index 00000000..35190bfb
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0651-drm-amd-display-Fix-generic_reg_wait-1000ms-case.patch
@@ -0,0 +1,35 @@
+From 04af551b2fa8cdc644fc3ce2ff0e814ea00428fa Mon Sep 17 00:00:00 2001
+From: Eric Yang <Eric.Yang2@amd.com>
+Date: Sun, 23 Jul 2017 14:17:09 -0400
+Subject: [PATCH 0651/4131] drm/amd/display: Fix generic_reg_wait 1000ms case
+
+Signed-off-by: Eric Yang <Eric.Yang2@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/dc_helper.c | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/display/dc/dc_helper.c b/drivers/gpu/drm/amd/display/dc/dc_helper.c
+index 87b7f6f..f219bd2 100644
+--- a/drivers/gpu/drm/amd/display/dc/dc_helper.c
++++ b/drivers/gpu/drm/amd/display/dc/dc_helper.c
+@@ -143,11 +143,10 @@ uint32_t generic_reg_wait(const struct dc_context *ctx,
+
+ for (i = 0; i <= time_out_num_tries; i++) {
+ if (i) {
+- if (0 < delay_between_poll_us && delay_between_poll_us < 1000)
+- udelay(delay_between_poll_us);
+-
+- if (delay_between_poll_us > 1000)
++ if (delay_between_poll_us >= 1000)
+ msleep(delay_between_poll_us/1000);
++ else if (delay_between_poll_us > 0)
++ udelay(delay_between_poll_us);
+ }
+
+ reg_val = dm_read_reg(ctx, addr);
+--
+2.7.4
+