1 files changed, 43 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3490-drm-amd-display-Fix-multiple-definitions-of-handle_c.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3490-drm-amd-display-Fix-multiple-definitions-of-handle_c.patch
new file mode 100644
index 00000000..e9c8610d
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3490-drm-amd-display-Fix-multiple-definitions-of-handle_c.patch
@@ -0,0 +1,43 @@
+From 0f64eb34de02639bd2e5485298d3d03a330066c8 Mon Sep 17 00:00:00 2001
+From: "Leo (Sunpeng) Li" <sunpeng.li@amd.com>
+Date: Fri, 12 Jan 2018 13:13:11 -0500
+Subject: [PATCH 3490/4131] drm/amd/display: Fix multiple definitions of
+ handle_crc_irq
+
+If CONFIG_DEBUG_FS is disabled, then CRC should also be disabled.
+Therefore, amdgpu_dm_crtc_handle_crc_irq was redefined as a no-op
+function within amdgpu_dm.h.
+
+However, since amdgpu_dm.h is included in multiple files, this caused
+conflicts when linking during compile. Therefore, Use a macro to
+define the function as a no-op instead.
+
+Change-Id: Ic9d5f45f3924693a12285c21f8d939a3218ab045
+
+Conflicts:
+      drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
+
+Reviewed-by: Harry Wentland <Harry.Wentland@amd.com>
+Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Leo (Sunpeng) Li <sunpeng.li@amd.com>
+---
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
+index b13c660..1242036 100644
+--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
+@@ -266,7 +266,7 @@ int amdgpu_dm_crtc_set_crc_source(struct drm_crtc *crtc, const char *src_name,
+ void amdgpu_dm_crtc_handle_crc_irq(struct drm_crtc *crtc);
+ #else
+ #define amdgpu_dm_crtc_set_crc_source NULL
+-static inline void amdgpu_dm_crtc_handle_crc_irq(struct drm_crtc *crtc) {}
++#define amdgpu_dm_crtc_handle_crc_irq(x)
+ #endif
+ 
+ extern const struct drm_encoder_helper_funcs amdgpu_dm_encoder_helper_funcs;
+-- 
+2.7.4
+