Commit 2595fe04 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/display: make FP handling in Makefiles consistent 



Use the same pattern as the DML Makefile and while we are here
add a missing x86 guard around the msse flags for DCN3.2.x.

Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4e1db011

drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ CLK_MGR_DCN32 = dcn32_clk_mgr.o dcn32_clk_mgr_smu_msg.o 
AMD_DAL_CLK_MGR_DCN32 = $(addprefix $(AMDDALPATH)/dc/clk_mgr/dcn32/,$(CLK_MGR_DCN32))



ifdef CONFIG_X86

CFLAGS_$(AMDDALPATH)/dc/clk_mgr/dcn32/dcn32_clk_mgr.o := -msse

CFLAGS_$(AMDDALPATH)/dc/clk_mgr/dcn32/dcn32_clk_mgr.o := -mhard-float -msse

endif



ifdef CONFIG_PPC64
@@ -191,7 +191,6 @@ ifdef CONFIG_CC_IS_GCC 
ifeq ($(call cc-ifversion, -lt, 0701, y), y)

IS_OLD_GCC = 1

endif

CFLAGS_$(AMDDALPATH)/dc/clk_mgr/dcn32/dcn32_clk_mgr.o := -mhard-float

endif



ifdef CONFIG_X86

drivers/gpu/drm/amd/display/dc/dcn201/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ ifdef CONFIG_CC_IS_GCC 
ifeq ($(call cc-ifversion, -lt, 0701, y), y)

IS_OLD_GCC = 1

endif

CFLAGS_$(AMDDALPATH)/dc/dcn201/dcn201_resource.o += -mhard-float

endif



ifdef CONFIG_X86

drivers/gpu/drm/amd/display/dc/dcn30/Makefile

+2 −4
Original line number Diff line number Diff line
@@ -32,8 +32,8 @@ DCN30 = dcn30_init.o dcn30_hubbub.o dcn30_hubp.o dcn30_dpp.o dcn30_optc.o \ 




ifdef CONFIG_X86

CFLAGS_$(AMDDALPATH)/dc/dcn30/dcn30_resource.o := -msse

CFLAGS_$(AMDDALPATH)/dc/dcn30/dcn30_optc.o := -msse

CFLAGS_$(AMDDALPATH)/dc/dcn30/dcn30_resource.o := -mhard-float -msse

CFLAGS_$(AMDDALPATH)/dc/dcn30/dcn30_optc.o := -mhard-float -msse

endif



ifdef CONFIG_PPC64
@@ -45,8 +45,6 @@ ifdef CONFIG_CC_IS_GCC 
ifeq ($(call cc-ifversion, -lt, 0701, y), y)

IS_OLD_GCC = 1

endif

CFLAGS_$(AMDDALPATH)/dc/dcn30/dcn30_resource.o += -mhard-float

CFLAGS_$(AMDDALPATH)/dc/dcn30/dcn30_optc.o += -mhard-float

endif



ifdef CONFIG_X86

drivers/gpu/drm/amd/display/dc/dcn302/Makefile

+7 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
DCN3_02 = dcn302_init.o dcn302_hwseq.o dcn302_resource.o



ifdef CONFIG_X86

CFLAGS_$(AMDDALPATH)/dc/dcn302/dcn302_resource.o := -msse

CFLAGS_$(AMDDALPATH)/dc/dcn302/dcn302_resource.o := -mhard-float -msse

endif



ifdef CONFIG_PPC64
@@ -16,6 +16,12 @@ CFLAGS_$(AMDDALPATH)/dc/dcn302/dcn302_resource.o := -mhard-float -maltivec 
endif



ifdef CONFIG_X86

ifdef CONFIG_CC_IS_GCC

ifeq ($(call cc-ifversion, -lt, 0701, y), y)

IS_OLD_GCC = 1

endif

endif



ifdef IS_OLD_GCC

# Stack alignment mismatch, proceed with caution.

# GCC < 7.1 cannot compile code using `double` and -mpreferred-stack-boundary=3

drivers/gpu/drm/amd/display/dc/dcn32/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ DCN32 = dcn32_resource.o dcn32_hubbub.o dcn32_hwseq.o dcn32_init.o \ 
		dcn32_mpc.o



ifdef CONFIG_X86

CFLAGS_$(AMDDALPATH)/dc/dcn32/dcn32_resource.o := -msse

CFLAGS_$(AMDDALPATH)/dc/dcn32/dcn32_resource.o := -mhard-float -msse

endif



ifdef CONFIG_PPC64
@@ -27,9 +27,9 @@ ifdef CONFIG_CC_IS_GCC 
ifeq ($(call cc-ifversion, -lt, 0701, y), y)

IS_OLD_GCC = 1

endif

CFLAGS_$(AMDDALPATH)/dc/dcn32/dcn32_resource.o += -mhard-float

endif



ifdef CONFIG_X86

ifdef IS_OLD_GCC

# Stack alignment mismatch, proceed with caution.

# GCC < 7.1 cannot compile code using `double` and -mpreferred-stack-boundary=3
@@ -38,6 +38,7 @@ CFLAGS_$(AMDDALPATH)/dc/dcn32/dcn32_resource.o += -mpreferred-stack-boundary=4 
else

CFLAGS_$(AMDDALPATH)/dc/dcn32/dcn32_resource.o += -msse2

endif

endif



AMD_DAL_DCN32 = $(addprefix $(AMDDALPATH)/dc/dcn32/,$(DCN32))