From: Tony Cheng <tony.cheng@amd.com>
Date: Sun, 23 Apr 2017 23:33:26 -0400
Subject: drm/amd/display: clarify delay param for REG_WAIT
Git-commit: 50db413d557c39de9a976e2c9826d4e86e721c7c
Patch-mainline: v4.15-rc1
References: FATE#326289 FATE#326079 FATE#326049 FATE#322398 FATE#326166

Signed-off-by: Tony Cheng <tony.cheng@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Reviewed-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Acked-by: Petr Tesarik <ptesarik@suse.com>
---
 drivers/gpu/drm/amd/display/dc/inc/reg_helper.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/drivers/gpu/drm/amd/display/dc/inc/reg_helper.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/reg_helper.h
@@ -185,10 +185,10 @@
 
 /* macro to poll and wait for a register field to read back given value */
 
-#define REG_WAIT(reg_name, field, val, delay, max_try)	\
+#define REG_WAIT(reg_name, field, val, delay_between_poll_us, max_try)	\
 		generic_reg_wait(CTX, \
 				REG(reg_name), FN(reg_name, field), val,\
-				delay, max_try, __func__)
+				delay_between_poll_us, max_try, __func__)
 
 /* macro to update (read, modify, write) register fields
  */