Skip to content

Commit 9d928d9

Browse files
committed
Merge tag 'powerpc-5.19-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fixes from Michael Ellerman: - Re-enable the new amdgpu display engine for powerpc, as long as the compiler is correctly configured. - Disable stack variable initialisation in prom_init to fix GCC 12 allmodconfig. Thanks to Dan Horák and Sudip Mukherjee. * tag 'powerpc-5.19-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: drm/amdgpu: Re-enable DCN for 64-bit powerpc powerpc/64s: Disable stack variable initialisation for prom_init
2 parents 6e2c049 + c653c59 commit 9d928d9

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

arch/powerpc/Kconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,10 @@ config PPC
282282
# Please keep this list sorted alphabetically.
283283
#
284284

285+
config PPC_LONG_DOUBLE_128
286+
depends on PPC64
287+
def_bool $(success,test "$(shell,echo __LONG_DOUBLE_128__ | $(CC) -E -P -)" = 1)
288+
285289
config PPC_BARRIER_NOSPEC
286290
bool
287291
default y

arch/powerpc/kernel/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ CFLAGS_prom.o += $(DISABLE_LATENT_ENTROPY_PLUGIN)
2020
CFLAGS_prom_init.o += -fno-stack-protector
2121
CFLAGS_prom_init.o += -DDISABLE_BRANCH_PROFILING
2222
CFLAGS_prom_init.o += -ffreestanding
23+
CFLAGS_prom_init.o += $(call cc-option, -ftrivial-auto-var-init=uninitialized)
2324

2425
ifdef CONFIG_FUNCTION_TRACER
2526
# Do not trace early boot code

drivers/gpu/drm/amd/display/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ config DRM_AMD_DC
66
bool "AMD DC - Enable new display engine"
77
default y
88
select SND_HDA_COMPONENT if SND_HDA_CORE
9-
select DRM_AMD_DC_DCN if X86 && !(KCOV_INSTRUMENT_ALL && KCOV_ENABLE_COMPARISONS)
9+
select DRM_AMD_DC_DCN if (X86 || PPC_LONG_DOUBLE_128) && !(KCOV_INSTRUMENT_ALL && KCOV_ENABLE_COMPARISONS)
1010
help
1111
Choose this option if you want to use the new display engine
1212
support for AMDGPU. This adds required support for Vega and

0 commit comments

Comments
 (0)