On Mon, Oct 09, 2023 at 11:18:36PM +0200, Arnd Bergmann wrote: > From: Arnd Bergmann <a...@arndb.de> > > 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-a...@kernel.org/ > --- > 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-a...@kernel.org/ > > > 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" <da...@davemloft.net> > Cc: "K. Y. Srinivasan" <k...@microsoft.com> > Cc: Ard Biesheuvel <a...@kernel.org> > Cc: Borislav Petkov <b...@alien8.de> > Cc: Brian Cain <bc...@quicinc.com> > Cc: Catalin Marinas <catalin.mari...@arm.com> > Cc: Christophe Leroy <christophe.le...@csgroup.eu> > Cc: Daniel Vetter <dan...@ffwll.ch> > Cc: Dave Hansen <dave.han...@linux.intel.com> > Cc: David Airlie <airl...@gmail.com> > Cc: Deepak Rawat <drawat.fl...@gmail.com> > Cc: Dexuan Cui <de...@microsoft.com> > Cc: Dinh Nguyen <dingu...@kernel.org> > Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org> > Cc: Guo Ren <guo...@kernel.org> > Cc: Haiyang Zhang <haiya...@microsoft.com> > Cc: Helge Deller <del...@gmx.de> > Cc: Huacai Chen <chenhua...@kernel.org> > Cc: Ingo Molnar <mi...@redhat.com> > Cc: Javier Martinez Canillas <javi...@redhat.com> > Cc: John Paul Adrian Glaubitz <glaub...@physik.fu-berlin.de> > Cc: Khalid Aziz <kha...@gonehiking.org> > Cc: Linus Walleij <linus.wall...@linaro.org> > Cc: Matt Turner <matts...@gmail.com> > Cc: Max Filippov <jcmvb...@gmail.com> > Cc: Michael Ellerman <m...@ellerman.id.au> > Cc: Nicholas Piggin <npig...@gmail.com> > Cc: Palmer Dabbelt <pal...@dabbelt.com> > Cc: Russell King <li...@armlinux.org.uk> > Cc: Thomas Bogendoerfer <tsbog...@alpha.franken.de> > Cc: Thomas Gleixner <t...@linutronix.de> > Cc: Thomas Zimmermann <tzimmerm...@suse.de> > Cc: WANG Xuerui <ker...@xen0n.name> > Cc: Wei Liu <wei....@kernel.org> > Cc: Will Deacon <w...@kernel.org> > Cc: x...@kernel.org > Cc: linux-al...@vger.kernel.org > Cc: linux-ker...@vger.kernel.org > Cc: linux-arm-ker...@lists.infradead.org > Cc: linux-...@vger.kernel.org > Cc: linux-c...@vger.kernel.org > Cc: linux-hexa...@vger.kernel.org > Cc: linux-i...@vger.kernel.org > Cc: loonga...@lists.linux.dev > Cc: linux-m...@vger.kernel.org > Cc: linuxppc-...@lists.ozlabs.org > Cc: linux-ri...@lists.infradead.org > Cc: linux...@vger.kernel.org > Cc: sparcli...@vger.kernel.org > Cc: linux-hyp...@vger.kernel.org > Cc: dri-devel@lists.freedesktop.org > Cc: linux-fb...@vger.kernel.org > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch