blob: 280085d8a4d83f64782fccf2618a5f1e1841e643 (
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
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
|
From 0c036bceeb7e4d36d8a186608203cae70cf97120 Mon Sep 17 00:00:00 2001
From: Harry Wentland <harry.wentland@amd.com>
Date: Wed, 3 May 2017 14:21:37 -0400
Subject: [PATCH 0410/4131] drm/amd/display: ifdef some code only needed for
DCN
Signed-off-by: Harry Wentland <harry.wentland@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/inc/core_types.h | 4 ++++
drivers/gpu/drm/amd/display/dc/inc/hw/ipp.h | 2 ++
drivers/gpu/drm/amd/display/dc/inc/hw/opp.h | 2 ++
3 files changed, 8 insertions(+)
diff --git a/drivers/gpu/drm/amd/display/dc/inc/core_types.h b/drivers/gpu/drm/amd/display/dc/inc/core_types.h
index fcda3c7..919c663 100644
--- a/drivers/gpu/drm/amd/display/dc/inc/core_types.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/core_types.h
@@ -31,8 +31,10 @@
#include "dcn_calcs.h"
#include "ddc_service_types.h"
#include "dc_bios_types.h"
+#if defined(CONFIG_DRM_AMD_DC_DCN1_0)
#include "mem_input.h"
#include "mpc.h"
+#endif
struct core_stream;
@@ -256,7 +258,9 @@ struct resource_pool {
struct abm *abm;
struct dmcu *dmcu;
+#if defined(CONFIG_DRM_AMD_DC_DCN1_0)
struct mpc *mpc;
+#endif
const struct resource_funcs *funcs;
const struct resource_caps *res_cap;
diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/ipp.h b/drivers/gpu/drm/amd/display/dc/inc/hw/ipp.h
index 0f952e5..1298d30 100644
--- a/drivers/gpu/drm/amd/display/dc/inc/hw/ipp.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/hw/ipp.h
@@ -122,7 +122,9 @@ struct ipp_funcs {
struct input_pixel_processor *ipp,
const struct pwl_params *params);
+#if defined(CONFIG_DRM_AMD_DC_DCN1_0)
void (*ipp_destroy)(struct input_pixel_processor **ipp);
+#endif
};
#endif /* __DAL_IPP_H__ */
diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/opp.h b/drivers/gpu/drm/amd/display/dc/inc/hw/opp.h
index 64d4325..a101f4b 100644
--- a/drivers/gpu/drm/amd/display/dc/inc/hw/opp.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/hw/opp.h
@@ -27,7 +27,9 @@
#define __DAL_OPP_H__
#include "hw_shared.h"
+#if defined(CONFIG_DRM_AMD_DC_DCN1_0)
#include "dc_hw_types.h"
+#endif
#include "transform.h"
struct fixed31_32;
--
2.7.4
|
