On Mon, Oct 09, 2023 at 11:18:36PM +0200, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@xxxxxxxx> > > v3 changelog > > No real changes, just rebased for context changes, and picked up the Acks. > > This now conflicts with the ia64 removal and introduces one new dependency > on IA64, but that is harmless and trivial to deal with later. > > Link: https://lore.kernel.org/lkml/20230719123944.3438363-1-arnd@xxxxxxxxxx/ > --- > v2 changelog > > I refreshed the first four patches that I sent before with very minor > updates, and then added some more to further disaggregate the use > of screen_info: > > - I found that powerpc wasn't using vga16fb any more > > - vgacon can be almost entirely separated from the global > screen_info, except on x86 > > - similarly, the EFI framebuffer initialization can be > kept separate, except on x86. > > I did extensive build testing on arm/arm64/x86 and the normal built bot > testing for the other architectures. > > Which tree should this get merged through? I guess if no one else volunteers (Greg maybe?) I can stuff this into drm-misc ... -Sima > > Link: https://lore.kernel.org/lkml/20230707095415.1449376-1-arnd@xxxxxxxxxx/ > > > Arnd Bergmann (9): > vgacon: rework Kconfig dependencies > vgacon: rework screen_info #ifdef checks > dummycon: limit Arm console size hack to footbridge > vgacon, arch/*: remove unused screen_info definitions > vgacon: remove screen_info dependency > vgacon: clean up global screen_info instances > vga16fb: drop powerpc support > hyperv: avoid dependency on screen_info > efi: move screen_info into efi init code > > arch/alpha/kernel/proto.h | 2 + > arch/alpha/kernel/setup.c | 8 +-- > arch/alpha/kernel/sys_sio.c | 8 ++- > arch/arm/include/asm/setup.h | 5 ++ > arch/arm/kernel/atags_parse.c | 20 +++--- > arch/arm/kernel/efi.c | 6 -- > arch/arm/kernel/setup.c | 11 +-- > arch/arm64/kernel/efi.c | 4 -- > arch/arm64/kernel/image-vars.h | 2 + > arch/csky/kernel/setup.c | 12 ---- > arch/hexagon/kernel/Makefile | 2 - > arch/hexagon/kernel/screen_info.c | 3 - > arch/ia64/kernel/setup.c | 53 ++++++++------- > arch/loongarch/kernel/efi.c | 3 +- > arch/loongarch/kernel/image-vars.h | 2 + > arch/loongarch/kernel/setup.c | 3 - > arch/mips/jazz/setup.c | 9 --- > arch/mips/kernel/setup.c | 11 --- > arch/mips/mti-malta/malta-setup.c | 4 +- > arch/mips/sibyte/swarm/setup.c | 26 ++++--- > arch/mips/sni/setup.c | 18 ++--- > arch/nios2/kernel/setup.c | 5 -- > arch/powerpc/kernel/setup-common.c | 16 ----- > arch/riscv/kernel/image-vars.h | 2 + > arch/riscv/kernel/setup.c | 12 ---- > arch/sh/kernel/setup.c | 5 -- > arch/sparc/kernel/setup_32.c | 13 ---- > arch/sparc/kernel/setup_64.c | 13 ---- > arch/x86/kernel/setup.c | 2 +- > arch/xtensa/kernel/setup.c | 12 ---- > drivers/firmware/efi/efi-init.c | 14 +++- > drivers/firmware/efi/libstub/efi-stub-entry.c | 8 ++- > drivers/firmware/pcdp.c | 1 - > drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 7 +- > drivers/hv/vmbus_drv.c | 6 +- > drivers/video/console/Kconfig | 11 +-- > drivers/video/console/dummycon.c | 2 +- > drivers/video/console/vgacon.c | 68 +++++++++++-------- > drivers/video/fbdev/Kconfig | 2 +- > drivers/video/fbdev/hyperv_fb.c | 8 +-- > drivers/video/fbdev/vga16fb.c | 9 +-- > include/linux/console.h | 7 ++ > 42 files changed, 183 insertions(+), 252 deletions(-) > delete mode 100644 arch/hexagon/kernel/screen_info.c > > -- > 2.39.2 > > Cc: "David S. Miller" <davem@xxxxxxxxxxxxx> > Cc: "K. Y. Srinivasan" <kys@xxxxxxxxxxxxx> > Cc: Ard Biesheuvel <ardb@xxxxxxxxxx> > Cc: Borislav Petkov <bp@xxxxxxxxx> > Cc: Brian Cain <bcain@xxxxxxxxxxx> > Cc: Catalin Marinas <catalin.marinas@xxxxxxx> > Cc: Christophe Leroy <christophe.leroy@xxxxxxxxxx> > Cc: Daniel Vetter <daniel@xxxxxxxx> > Cc: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx> > Cc: David Airlie <airlied@xxxxxxxxx> > Cc: Deepak Rawat <drawat.floss@xxxxxxxxx> > Cc: Dexuan Cui <decui@xxxxxxxxxxxxx> > Cc: Dinh Nguyen <dinguyen@xxxxxxxxxx> > Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > Cc: Guo Ren <guoren@xxxxxxxxxx> > Cc: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx> > Cc: Helge Deller <deller@xxxxxx> > Cc: Huacai Chen <chenhuacai@xxxxxxxxxx> > Cc: Ingo Molnar <mingo@xxxxxxxxxx> > Cc: Javier Martinez Canillas <javierm@xxxxxxxxxx> > Cc: John Paul Adrian Glaubitz <glaubitz@xxxxxxxxxxxxxxxxxxx> > Cc: Khalid Aziz <khalid@xxxxxxxxxxxxxx> > Cc: Linus Walleij <linus.walleij@xxxxxxxxxx> > Cc: Matt Turner <mattst88@xxxxxxxxx> > Cc: Max Filippov <jcmvbkbc@xxxxxxxxx> > Cc: Michael Ellerman <mpe@xxxxxxxxxxxxxx> > Cc: Nicholas Piggin <npiggin@xxxxxxxxx> > Cc: Palmer Dabbelt <palmer@xxxxxxxxxxx> > Cc: Russell King <linux@xxxxxxxxxxxxxxx> > Cc: Thomas Bogendoerfer <tsbogend@xxxxxxxxxxxxxxxx> > Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> > Cc: Thomas Zimmermann <tzimmermann@xxxxxxx> > Cc: WANG Xuerui <kernel@xxxxxxxxxx> > Cc: Wei Liu <wei.liu@xxxxxxxxxx> > Cc: Will Deacon <will@xxxxxxxxxx> > Cc: x86@xxxxxxxxxx > Cc: linux-alpha@xxxxxxxxxxxxxxx > Cc: linux-kernel@xxxxxxxxxxxxxxx > Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx > Cc: linux-efi@xxxxxxxxxxxxxxx > Cc: linux-csky@xxxxxxxxxxxxxxx > Cc: linux-hexagon@xxxxxxxxxxxxxxx > Cc: linux-ia64@xxxxxxxxxxxxxxx > Cc: loongarch@xxxxxxxxxxxxxxx > Cc: linux-mips@xxxxxxxxxxxxxxx > Cc: linuxppc-dev@xxxxxxxxxxxxxxxx > Cc: linux-riscv@xxxxxxxxxxxxxxxxxxx > Cc: linux-sh@xxxxxxxxxxxxxxx > Cc: sparclinux@xxxxxxxxxxxxxxx > Cc: linux-hyperv@xxxxxxxxxxxxxxx > Cc: dri-devel@xxxxxxxxxxxxxxxxxxxxx > Cc: linux-fbdev@xxxxxxxxxxxxxxx > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch