[PATCH] drm/amdgpu/display: make FP handling in Makefiles consistent

Christian König ckoenig.leichtzumerken at gmail.com
Mon Jun 13 06:07:57 UTC 2022 

Am 10.06.22 um 17:42 schrieb Alex Deucher:
> 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.

IIRC the idea was to limit the whole float handling to the DML and 
remove it from the rest of the code.

But not sure if that's already completed yet.

Christian.

>
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
> ---
>   drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 3 +--
>   drivers/gpu/drm/amd/display/dc/dcn201/Makefile  | 1 -
>   drivers/gpu/drm/amd/display/dc/dcn30/Makefile   | 6 ++----
>   drivers/gpu/drm/amd/display/dc/dcn302/Makefile  | 8 +++++++-
>   drivers/gpu/drm/amd/display/dc/dcn32/Makefile   | 5 +++--
>   drivers/gpu/drm/amd/display/dc/dcn321/Makefile  | 5 +++--
>   6 files changed, 16 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile b/drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile
> index c935c10b5f4f..7b505e1e9308 100644
> --- a/drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile
> +++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile
> @@ -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
> diff --git a/drivers/gpu/drm/amd/display/dc/dcn201/Makefile b/drivers/gpu/drm/amd/display/dc/dcn201/Makefile
> index f68038ceb1b1..96cbd4ccd344 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn201/Makefile
> +++ b/drivers/gpu/drm/amd/display/dc/dcn201/Makefile
> @@ -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
> diff --git a/drivers/gpu/drm/amd/display/dc/dcn30/Makefile b/drivers/gpu/drm/amd/display/dc/dcn30/Makefile
> index dfd77b3cc84d..c20331eb62e0 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn30/Makefile
> +++ b/drivers/gpu/drm/amd/display/dc/dcn30/Makefile
> @@ -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
> diff --git a/drivers/gpu/drm/amd/display/dc/dcn302/Makefile b/drivers/gpu/drm/amd/display/dc/dcn302/Makefile
> index f9561d7f97a1..e4b69ad0dde5 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn302/Makefile
> +++ b/drivers/gpu/drm/amd/display/dc/dcn302/Makefile
> @@ -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
> diff --git a/drivers/gpu/drm/amd/display/dc/dcn32/Makefile b/drivers/gpu/drm/amd/display/dc/dcn32/Makefile
> index 3d09db3070f4..34f2e37b6704 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn32/Makefile
> +++ b/drivers/gpu/drm/amd/display/dc/dcn32/Makefile
> @@ -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))
>   
> diff --git a/drivers/gpu/drm/amd/display/dc/dcn321/Makefile b/drivers/gpu/drm/amd/display/dc/dcn321/Makefile
> index 5896ca303e39..e554fd6c16f2 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn321/Makefile
> +++ b/drivers/gpu/drm/amd/display/dc/dcn321/Makefile
> @@ -13,7 +13,7 @@
>   DCN321 = dcn321_resource.o dcn321_dio_link_encoder.o
>   
>   ifdef CONFIG_X86
> -CFLAGS_$(AMDDALPATH)/dc/dcn321/dcn321_resource.o := -msse
> +CFLAGS_$(AMDDALPATH)/dc/dcn321/dcn321_resource.o := -mhard-float -msse
>   endif
>   
>   ifdef CONFIG_PPC64
> @@ -24,9 +24,9 @@ ifdef CONFIG_CC_IS_GCC
>   ifeq ($(call cc-ifversion, -lt, 0701, y), y)
>   IS_OLD_GCC = 1
>   endif
> -CFLAGS_$(AMDDALPATH)/dc/dcn321/dcn321_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
> @@ -35,6 +35,7 @@ CFLAGS_$(AMDDALPATH)/dc/dcn321/dcn321_resource.o += -mpreferred-stack-boundary=4
>   else
>   CFLAGS_$(AMDDALPATH)/dc/dcn321/dcn321_resource.o += -msse2
>   endif
> +endif
>   
>   AMD_DAL_DCN321 = $(addprefix $(AMDDALPATH)/dc/dcn321/,$(DCN321))
>

More information about the amd-gfx mailing list