aboutsummaryrefslogtreecommitdiffstats
path: root/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0619-drm-amd-display-add-line-number-to-reg_wait-timeout-.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0619-drm-amd-display-add-line-number-to-reg_wait-timeout-.patch')
-rw-r--r--meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0619-drm-amd-display-add-line-number-to-reg_wait-timeout-.patch69
1 files changed, 0 insertions, 69 deletions
diff --git a/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0619-drm-amd-display-add-line-number-to-reg_wait-timeout-.patch b/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0619-drm-amd-display-add-line-number-to-reg_wait-timeout-.patch
deleted file mode 100644
index 08c43189..00000000
--- a/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0619-drm-amd-display-add-line-number-to-reg_wait-timeout-.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 66976d9307f70423a1da57323b59b6a493b58500 Mon Sep 17 00:00:00 2001
-From: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
-Date: Tue, 11 Jul 2017 13:48:17 -0400
-Subject: [PATCH 0619/4131] 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>
----
- drivers/gpu/drm/amd/display/dc/dc_helper.c | 6 +++---
- drivers/gpu/drm/amd/display/dc/dm_services.h | 2 +-
- drivers/gpu/drm/amd/display/dc/inc/reg_helper.h | 2 +-
- 3 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/drivers/gpu/drm/amd/display/dc/dc_helper.c b/drivers/gpu/drm/amd/display/dc/dc_helper.c
-index 8ed1440..87b7f6f 100644
---- 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 fb61e33..ea494a7 100644
---- 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 1828d28..77eb728 100644
---- 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
- */
---
-2.7.4
-