drm/amd/display: add line number to reg_wait timeout print

Signed-off-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@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>

diff --git a/drivers/gpu/drm/amd/display/dc/dc_helper.c b/drivers/gpu/drm/amd/display/dc/dc_helper.c
index 8ed1440d2b010f948a0c052740001ed0603744b9..87b7f6f8870e6e56811461e1c0fef59728642f3b 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc_helper.c
+++ b/drivers/gpu/drm/amd/display/dc/dc_helper.c
@@ -129,7 +129,7 @@ uint32_t generic_reg_get(const struct dc_context *ctx,
 uint32_t generic_reg_wait(const struct dc_context *ctx,
        uint32_t addr, uint32_t shift, uint32_t mask, uint32_t condition_value,
        unsigned int delay_between_poll_us, unsigned int time_out_num_tries,
-       const char *func_name)
+       const char *func_name, int line)
 {
        uint32_t field_value;
        uint32_t reg_val;
@@ -158,8 +158,8 @@ uint32_t generic_reg_wait(const struct dc_context *ctx,
                        return reg_val;
        }
 
-       dm_error("REG_WAIT timeout %dus * %d tries - %s\n",
-                       delay_between_poll_us, time_out_num_tries, func_name);
+       dm_error("REG_WAIT timeout %dus * %d tries - %s line:%d\n",
+                       delay_between_poll_us, time_out_num_tries, func_name, line);
 
        if (!IS_FPGA_MAXIMUS_DC(ctx->dce_environment))
                BREAK_TO_DEBUGGER();

diff --git a/drivers/gpu/drm/amd/display/dc/dm_services.h b/drivers/gpu/drm/amd/display/dc/dm_services.h
index fb61e333aefdb46e7beec5e835d847ad9c4d598e..ea494a71a80b074cea5d7974f73aa7de21b37f94 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dm_services.h
+++ b/drivers/gpu/drm/amd/display/dc/dm_services.h
@@ -194,7 +194,7 @@ uint32_t generic_reg_update_ex(const struct dc_context *ctx,
 unsigned int generic_reg_wait(const struct dc_context *ctx,
        uint32_t addr, uint32_t mask, uint32_t shift, uint32_t condition_value,
        unsigned int delay_between_poll_us, unsigned int time_out_num_tries,
-       const char *func_name);
+       const char *func_name, int line);
 
 
 /* These macros need to be used with soc15 registers in order to retrieve

diff --git a/drivers/gpu/drm/amd/display/dc/inc/reg_helper.h b/drivers/gpu/drm/amd/display/dc/inc/reg_helper.h
index 1828d288c6bc8dd7016acd4e305f0a5b3c96407c..77eb72874e90106d2baca5eb2c8f36f5171aff3a 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/inc/reg_helper.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/reg_helper.h
@@ -188,7 +188,7 @@
 #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_between_poll_us, max_try, __func__)
+                               delay_between_poll_us, max_try, __func__, __LINE__)
 
 /* macro to update (read, modify, write) register fields
  */