1 files changed, 34 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2639-drm-amdgpu-display-remove-unused-REG_OFFSET-macro.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2639-drm-amdgpu-display-remove-unused-REG_OFFSET-macro.patch
new file mode 100644
index 00000000..637ce86f
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2639-drm-amdgpu-display-remove-unused-REG_OFFSET-macro.patch
@@ -0,0 +1,34 @@
+From 9f43c26b25c1e69f8c9af25ff70894bf5f757769 Mon Sep 17 00:00:00 2001
+From: Arnd Bergmann <arnd@arndb.de>
+Date: Thu, 2 Nov 2017 12:26:42 +0100
+Subject: [PATCH 2639/4131] drm/amdgpu/display: remove unused REG_OFFSET macro
+
+The name conflicts with another macro of the same name on the ARM ixp4xx
+platform, leading to build errors.
+Neither of the users actually should use a name that generic, but the
+other one was here first and the dc driver doesn't actually use it.
+
+Reviewed-by: Harry Wentland <harry.wentland@amd.com>
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/display/dc/dm_services.h | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/display/dc/dm_services.h b/drivers/gpu/drm/amd/display/dc/dm_services.h
+index c8190c3..d491703 100644
+--- a/drivers/gpu/drm/amd/display/dc/dm_services.h
++++ b/drivers/gpu/drm/amd/display/dc/dm_services.h
+@@ -160,9 +160,6 @@ unsigned int generic_reg_wait(const struct dc_context *ctx,
+ /* These macros need to be used with soc15 registers in order to retrieve
+  * the actual offset.
+  */
+-#define REG_OFFSET(reg) (reg + DCE_BASE.instance[0].segment[reg##_BASE_IDX])
+-#define REG_BIF_OFFSET(reg) (reg + NBIF_BASE.instance[0].segment[reg##_BASE_IDX])
+-
+ #define dm_write_reg_soc15(ctx, reg, inst_offset, value)	\
+ 		dm_write_reg_func(ctx, reg + DCE_BASE.instance[0].segment[reg##_BASE_IDX] + inst_offset, value, __func__)
+ 
+-- 
+2.7.4
+