Skip to content

Commit 06a990b

Browse files
mpeakpm00
authored andcommitted
drm/amd/display: only use hard-float, not altivec on powerpc
The compiler flags enable altivec, but that is not required; hard-float is sufficient for the code to build and function. Drop altivec from the compiler flags and adjust the enable/disable code to only enable FPU use. Link: https://lkml.kernel.org/r/20240329072441.591471-13-samuel.holland@sifive.com Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Signed-off-by: Samuel Holland <samuel.holland@sifive.com> Acked-by: Alex Deucher <alexander.deucher@amd.com> Acked-by: Christian König <christian.koenig@amd.com> Cc: Borislav Petkov (AMD) <bp@alien8.de> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Christoph Hellwig <hch@lst.de> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: Huacai Chen <chenhuacai@kernel.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Jonathan Corbet <corbet@lwn.net> Cc: Masahiro Yamada <masahiroy@kernel.org> Cc: Nathan Chancellor <nathan@kernel.org> Cc: Nicolas Schier <nicolas@fjasle.eu> Cc: Palmer Dabbelt <palmer@rivosinc.com> Cc: Russell King <linux@armlinux.org.uk> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: WANG Xuerui <git@xen0n.name> Cc: Will Deacon <will@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent 77acc6b commit 06a990b

File tree

3 files changed

+4
-12
lines changed

3 files changed

+4
-12
lines changed

drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.c

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,7 @@ void dc_fpu_begin(const char *function_name, const int line)
9292
#if defined(CONFIG_X86) || defined(CONFIG_LOONGARCH)
9393
kernel_fpu_begin();
9494
#elif defined(CONFIG_PPC64)
95-
if (cpu_has_feature(CPU_FTR_VSX_COMP))
96-
enable_kernel_vsx();
97-
else if (cpu_has_feature(CPU_FTR_ALTIVEC_COMP))
98-
enable_kernel_altivec();
99-
else if (!cpu_has_feature(CPU_FTR_FPU_UNAVAILABLE))
95+
if (!cpu_has_feature(CPU_FTR_FPU_UNAVAILABLE))
10096
enable_kernel_fp();
10197
#elif defined(CONFIG_ARM64)
10298
kernel_neon_begin();
@@ -125,11 +121,7 @@ void dc_fpu_end(const char *function_name, const int line)
125121
#if defined(CONFIG_X86) || defined(CONFIG_LOONGARCH)
126122
kernel_fpu_end();
127123
#elif defined(CONFIG_PPC64)
128-
if (cpu_has_feature(CPU_FTR_VSX_COMP))
129-
disable_kernel_vsx();
130-
else if (cpu_has_feature(CPU_FTR_ALTIVEC_COMP))
131-
disable_kernel_altivec();
132-
else if (!cpu_has_feature(CPU_FTR_FPU_UNAVAILABLE))
124+
if (!cpu_has_feature(CPU_FTR_FPU_UNAVAILABLE))
133125
disable_kernel_fp();
134126
#elif defined(CONFIG_ARM64)
135127
kernel_neon_end();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ dml_ccflags := $(dml_ccflags-y) -msse
3131
endif
3232

3333
ifdef CONFIG_PPC64
34-
dml_ccflags := -mhard-float -maltivec
34+
dml_ccflags := -mhard-float
3535
endif
3636

3737
ifdef CONFIG_ARM64

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ dml2_ccflags := $(dml2_ccflags-y) -msse
3030
endif
3131

3232
ifdef CONFIG_PPC64
33-
dml2_ccflags := -mhard-float -maltivec
33+
dml2_ccflags := -mhard-float
3434
endif
3535

3636
ifdef CONFIG_ARM64

0 commit comments

Comments
 (0)