blob: 091dcc1d4195940526e94e8e24e15baa50aa8a82 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
From 030b16c2e444d14a65ca4c6e606aaeaa3bd318ed Mon Sep 17 00:00:00 2001
From: Harry Wentland <harry.wentland@amd.com>
Date: Thu, 10 Aug 2017 16:16:20 -0400
Subject: [PATCH 0972/4131] drm/amd/display: Leave DCN config guard around fpu
header
See
https://lists.freedesktop.org/archives/dri-devel/2017-August/149938.html
Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Reviewed-by: Jordan Lazare <Jordan.Lazare@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Conflicts:
drivers/gpu/drm/amd/display/dc/dm_services.h
Change-Id: I9ed7aa808d4f28ead846e686ea3f18f03b2975b1
---
drivers/gpu/drm/amd/display/dc/dm_services.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/gpu/drm/amd/display/dc/dm_services.h b/drivers/gpu/drm/amd/display/dc/dm_services.h
index a7d661d..e9bf4c4 100644
--- a/drivers/gpu/drm/amd/display/dc/dm_services.h
+++ b/drivers/gpu/drm/amd/display/dc/dm_services.h
@@ -75,7 +75,9 @@
BREAK_TO_DEBUGGER(); \
} while (0)
+#if defined(CONFIG_DRM_AMD_DC_DCN1_0)
#include <asm/fpu/api.h>
+#endif
#define dm_alloc(size) kzalloc(size, GFP_KERNEL)
#define dm_realloc(ptr, size) krealloc(ptr, size, GFP_KERNEL)
--
2.7.4
|
