From: Eric Yang <Eric.Yang2@amd.com>
Date: Sun, 23 Jul 2017 14:17:09 -0400
Subject: drm/amd/display: Fix generic_reg_wait 1000ms case
Git-commit: 755d3bcfd44c16d344c7c6305ac6e7da19c27f5e
Patch-mainline: v4.15-rc1
References: FATE#326289 FATE#326079 FATE#326049 FATE#322398 FATE#326166
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>
Acked-by: Petr Tesarik <ptesarik@suse.com>
---
drivers/gpu/drm/amd/display/dc/dc_helper.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
--- 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 d
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);