From: Dave Airlie Date: Tue, 29 Oct 2019 19:46:00 +0000 (+1000) Subject: Merge tag 'drm-next-5.5-2019-10-25' of git://people.freedesktop.org/~agd5f/linux... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=60845e34f0c5c19a9e86af477b429993952f585b;p=linux.git Merge tag 'drm-next-5.5-2019-10-25' of git://people.freedesktop.org/~agd5f/linux into drm-next drm-next-5.5-2019-10-25: amdgpu: - BACO support for CI and VI asics - Quick memory training support for navi - MSI-X support - RAS fixes - Display AVI infoframe fixes - Display ref clock fixes for renoir - Fix number of audio endpoints in renoir - Fix for discovery tables - Powerplay fixes - Documentation fixes - Misc cleanups radeon: - revert a PPC fix which broke x86 Signed-off-by: Dave Airlie From: Alex Deucher Link: https://patchwork.freedesktop.org/patch/msgid/20191025221020.203546-1-alexander.deucher@amd.com --- 60845e34f0c5c19a9e86af477b429993952f585b diff --cc drivers/gpu/drm/amd/display/dc/dcn21/Makefile index ef673bffc241e,b7a9285348fbf..19fabac13c653 --- a/drivers/gpu/drm/amd/display/dc/dcn21/Makefile +++ b/drivers/gpu/drm/amd/display/dc/dcn21/Makefile @@@ -1,19 -1,9 +1,19 @@@ # # Makefile for DCN21. - DCN21 = dcn21_hubp.o dcn21_hubbub.o dcn21_resource.o + DCN21 = dcn21_hubp.o dcn21_hubbub.o dcn21_resource.o dcn21_hwseq.o dcn21_link_encoder.o -CFLAGS_dcn21_resource.o := -mhard-float -msse -mpreferred-stack-boundary=4 +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 + +CFLAGS_$(AMDDALPATH)/dc/dcn21/dcn21_resource.o := -mhard-float -msse $(cc_stack_align) + +ifdef CONFIG_CC_IS_CLANG +CFLAGS_$(AMDDALPATH)/dc/dcn21/dcn21_resource.o += -msse2 +endif AMD_DAL_DCN21 = $(addprefix $(AMDDALPATH)/dc/dcn21/,$(DCN21))