mirror of
https://github.com/torvalds/linux.git
synced 2026-04-23 17:15:46 -04:00
776c1f569f
[Why] display_mode_vba is for DCN2 and up. When building for upstream (DCN1 enabled only), there will be a build error, since display_mode_vba.c/h is stripped out. Note that building DCN1 only with internal dal-dev is still fine, since display_mode_vba.h is not stripped out internally - only in upstream. The make directives therefore stll work, and so will any #include's. [How] Since subsequent generations require DCN2 enabled anyways, guard the makefile directive for display_mode_vba.o with DCN2. Guard any includes with DCN2. In addition, guard the entire contents of display_mode_vba.h with DCN2, to simulate the file being stripped out in upstream. A forward declaration for 'struct display_mode_lib' also needs to be added in display_mode_lib.h. Previously, display_mode_vba.h contained the forward declaration, and display_mode_lib.h in turn included it. This won't work if mode_vba.h is stripped out, requring mode_lib.h to do so itself. Signed-off-by: Leo Li <sunpeng.li@amd.com> Reviewed-by: Harry Wentland <Harry.Wentland@amd.com> Acked-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
59 lines
2.2 KiB
Makefile
59 lines
2.2 KiB
Makefile
#
|
|
# Copyright 2017 Advanced Micro Devices, Inc.
|
|
#
|
|
# Permission is hereby granted, free of charge, to any person obtaining a
|
|
# copy of this software and associated documentation files (the "Software"),
|
|
# to deal in the Software without restriction, including without limitation
|
|
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
# and/or sell copies of the Software, and to permit persons to whom the
|
|
# Software is furnished to do so, subject to the following conditions:
|
|
#
|
|
# The above copyright notice and this permission notice shall be included in
|
|
# all copies or substantial portions of the Software.
|
|
#
|
|
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
# THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
|
# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
|
# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
# OTHER DEALINGS IN THE SOFTWARE.
|
|
#
|
|
#
|
|
# Makefile for the 'utils' sub-component of DAL.
|
|
# It provides the general basic services required by other DAL
|
|
# subcomponents.
|
|
|
|
ifneq ($(call cc-option, -mpreferred-stack-boundary=4),)
|
|
cc_stack_align := -mpreferred-stack-boundary=4
|
|
else ifneq ($(call cc-option, -mstack-alignment=16),)
|
|
cc_stack_align := -mstack-alignment=16
|
|
endif
|
|
|
|
dml_ccflags := -mhard-float -msse $(cc_stack_align)
|
|
|
|
CFLAGS_display_mode_lib.o := $(dml_ccflags)
|
|
|
|
ifdef CONFIG_DRM_AMD_DC_DCN2_0
|
|
CFLAGS_display_mode_vba.o := $(dml_ccflags)
|
|
CFLAGS_display_mode_vba_20.o := $(dml_ccflags)
|
|
CFLAGS_display_rq_dlg_calc_20.o := $(dml_ccflags)
|
|
endif
|
|
ifdef CONFIG_DRM_AMD_DCN3AG
|
|
CFLAGS_display_mode_vba_3ag.o := $(dml_ccflags)
|
|
endif
|
|
CFLAGS_dml1_display_rq_dlg_calc.o := $(dml_ccflags)
|
|
CFLAGS_display_rq_dlg_helpers.o := $(dml_ccflags)
|
|
CFLAGS_dml_common_defs.o := $(dml_ccflags)
|
|
|
|
DML = display_mode_lib.o display_rq_dlg_helpers.o dml1_display_rq_dlg_calc.o \
|
|
dml_common_defs.o
|
|
|
|
ifdef CONFIG_DRM_AMD_DC_DCN2_0
|
|
DML += display_mode_vba.o dcn20/display_rq_dlg_calc_20.o dcn20/display_mode_vba_20.o
|
|
endif
|
|
|
|
AMD_DAL_DML = $(addprefix $(AMDDALPATH)/dc/dml/,$(DML))
|
|
|
|
AMD_DISPLAY_FILES += $(AMD_DAL_DML)
|