diff options
| author | Harry Wentland <harry.wentland@amd.com> | 2017-05-03 14:21:37 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2017-09-26 18:07:00 -0400 |
| commit | f3e4341871bee5c91ffbf9d90c4f5af380759e33 (patch) | |
| tree | e52460c4d6ebdb1fb97b9d402df22ad30bba9c9c /drivers/gpu/drm | |
| parent | fe626734711b5f402fca9df5d33cb0663b6c2fe5 (diff) | |
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>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/inc/core_types.h | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/inc/hw/ipp.h | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/inc/hw/opp.h | 2 |
3 files changed, 8 insertions, 0 deletions
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; |