Change-Id: Ia910c1f4467c5bdbc7d1ee28ed9265c090cc184e
Signed-off-by: Harry Wentland <harry.wentland at amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng at amd.com>
Acked-by: Harry Wentland <Harry.Wentland at 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 fcda3c7db818..919c6632ee3e 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 0f952e5b3ae8..1298d306db69 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 64d43257db96..a101f4b5e0c7 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.11.0
