[GIT PULL] fbdev fixes and updates for v7.0-rc1

[GIT PULL] fbdev fixes and updates for v7.0-rc1

[Helge Deller]

Hi Linus,

please pull fixes and updates for fbdev for kernel 7.0-rc1.

Thanks to patches from Vincent Mailhol it's now easily possible to replace the
framebuffer penguin boot logo with an own logo at compile time.

The hyperv framebuffer driver has been removed, since the hyperv DRM driver now
seems to provide equal functionality.

Various console_conditional_schedule() calls across the console drivers (fbcon,
printk, vt) have been removed since they don't seem to be necessary any longer.

All other patches are either fixes in au1100fb, au1200fb, ffb, rivafb,
vt8500lcdfb and of_display_timing, or minor cleanups in the fbcon and omapfb
drivers.

All patches have been in for-next for the last 4-12 days without issues, but I
had to rebase to solve a trivial merge conflict with your tree.

Thanks!
Helge

----------------------------------------------------------------

The following changes since commit 770aaedb461a055f79b971d538678942b6607894:

  Merge tag 'bootconfig-v7.0' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace (2026-02-13 19:33:39 -0800)

are available in the Git repository at:

  http://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git tags/fbdev-for-7.0-rc1

for you to fetch changes up to a86039b76e5d1e886d42ec28f569a9ef76409750:

  fbcon: Declare struct fb_info.fbcon_par as of type struct fbcon_par (2026-02-14 11:09:47 +0100)

----------------------------------------------------------------
fbdev fixes & enhancements for 7.0-rc1:

New features:
- Allow custom fbdev boot logo [Vincent Mailhol]

Driver removal:
- fbdev: hyperv_fb: Remove hyperv_fb driver [Prasanna Kumar T S M]

Fixes:
- fbcon: check return value of con2fb_acquire_newinfo() [Andrey Vatoropin]
- fbdev: au1100fb: Check return value of clk_enable() in .resume() [Chen Ni]
- fbdev: au1200fb: Fix a memory leak in au1200fb_drv_probe() [Felix Gu]
- fbdev: ffb: fix corrupted video output on Sun FFB1 [René Rebe]
- fbdev: of_display_timing: Fix device node reference leak in of_get_display_timings() [Felix Gu]
- fbdev: of: display_timing: fix refcount leak in of_get_display_timings() [Weigang He]
- fbdev: rivafb: fix divide error in nv3_arb() [Guangshuo Li]
- fbdev: smscufx: properly copy ioctl memory to kernelspace [Greg Kroah-Hartman]
- fbdev: Use device_create_with_groups() to fix sysfs groups registration race [Hans de Goede]
- fbdev: vt8500lcdfb: fix missing dma_free_coherent() [Thomas Fourier]

Cleanups:
- fbcon: printk, vt: Remove console_conditional_schedule() [Sebastian Andrzej Siewior]
- fbcon: Declare struct fb_info.fbcon_par as of type struct fbcon_par [Thomas Zimmermann]
- fbcon: Remove struct fbcon_display.inverse [Thomas Zimmermann]
- fbdev: fix fb_pad_unaligned_buffer mask [Osama Abdelkader]
- fbdev: omapfb: remove duplicate check in omapfb_setup_mem() [Dan Carpenter]
- fbdev: omapfb, sh_mobile_lcdc, fbtft: Make FB_DEVICE dependency optional [Chintan Patel]

----------------------------------------------------------------
Andrey Vatoropin (1):
      fbcon: check return value of con2fb_acquire_newinfo()

Chen Ni (1):
      fbdev: au1100fb: Check return value of clk_enable() in .resume()

Chintan Patel (6):
      fb: Add dev_of_fbinfo() helper for optional sysfs support
      staging: fbtft: Make FB_DEVICE dependency optional
      fbdev: omapfb: Make FB_DEVICE dependency optional
      fbdev: sh_mobile_lcdc: Make FB_DEVICE dependency optional
      staging: fbtft: Fix build failure when CONFIG_FB_DEVICE=n
      staging: fbtft: Make framebuffer registration message debug-only

Dan Carpenter (1):
      fbdev: omapfb: remove duplicate check in omapfb_setup_mem()

Felix Gu (2):
      fbdev: of_display_timing: Fix device node reference leak in of_get_display_timings()
      fbdev: au1200fb: Fix a memory leak in au1200fb_drv_probe()

Greg Kroah-Hartman (1):
      fbdev: smscufx: properly copy ioctl memory to kernelspace

Guangshuo Li (1):
      fbdev: rivafb: fix divide error in nv3_arb()

Hans de Goede (1):
      fbdev: Use device_create_with_groups() to fix sysfs groups registration race

Osama Abdelkader (1):
      fbdev: fix fb_pad_unaligned_buffer mask

Prasanna Kumar T S M (3):
      fbdev: hyperv_fb: Remove hyperv_fb driver
      drivers: hv: vmbus_drv: Remove reference to hpyerv_fb
      drm/hyperv: Remove reference to hyperv_fb driver

René Rebe (1):
      fbdev: ffb: fix corrupted video output on Sun FFB1

Sebastian Andrzej Siewior (1):
      printk, vt, fbcon: Remove console_conditional_schedule()

Thomas Fourier (1):
      fbdev: vt8500lcdfb: fix missing dma_free_coherent()

Thomas Zimmermann (2):
      fbcon: Remove struct fbcon_display.inverse
      fbcon: Declare struct fb_info.fbcon_par as of type struct fbcon_par

Vincent Mailhol (8):
      video/logo: remove orphan .pgm Makefile rule
      video/logo: add a type parameter to the logo makefile function
      video/logo: allow custom logo
      newport_con: depend on LOGO_LINUX_CLUT224 instead of LOGO_SGI_CLUT224
      sh: defconfig: remove CONFIG_LOGO_SUPERH_*
      video/logo: remove logo_mac_clut224
      video/logo: move logo selection logic to Kconfig
      video/logo: don't select LOGO_LINUX_MONO and LOGO_LINUX_VGA16 by default

Weigang He (1):
      fbdev: of: display_timing: fix refcount leak in of_get_display_timings()

 MAINTAINERS                                     |   10 -
 arch/sh/configs/dreamcast_defconfig             |    2 -
 arch/sh/configs/ecovec24_defconfig              |    2 -
 arch/sh/configs/kfr2r09_defconfig               |    2 -
 arch/sh/configs/migor_defconfig                 |    2 -
 arch/sh/configs/rts7751r2d1_defconfig           |    2 -
 arch/sh/configs/rts7751r2dplus_defconfig        |    2 -
 arch/sh/configs/se7724_defconfig                |    2 -
 arch/sh/configs/se7780_defconfig                |    2 -
 arch/sh/configs/sh7785lcr_defconfig             |    3 -
 arch/sh/configs/urquell_defconfig               |    3 -
 drivers/gpu/drm/Kconfig                         |  146 +++
 drivers/gpu/drm/hyperv/hyperv_drm_proto.c       |   15 +-
 drivers/hv/vmbus_drv.c                          |    4 +-
 drivers/staging/fbtft/Kconfig                   |    5 +-
 drivers/staging/fbtft/fbtft-core.c              |   19 +-
 drivers/staging/fbtft/fbtft-sysfs.c             |   20 +-
 drivers/tty/vt/vt.c                             |    1 -
 drivers/video/console/newport_con.c             |    4 +-
 drivers/video/fbdev/Kconfig                     |   11 -
 drivers/video/fbdev/Makefile                    |    1 -
 drivers/video/fbdev/au1100fb.c                  |    5 +-
 drivers/video/fbdev/au1200fb.c                  |    6 +-
 drivers/video/fbdev/core/fbcon.c                |    9 +-
 drivers/video/fbdev/core/fbcon.h                |    1 -
 drivers/video/fbdev/core/fbmem.c                |    2 +-
 drivers/video/fbdev/core/fbsysfs.c              |   36 +-
 drivers/video/fbdev/ffb.c                       |   14 +-
 drivers/video/fbdev/hyperv_fb.c                 | 1388 --------------------
 drivers/video/fbdev/omap/omapfb_main.c          |   10 +-
 drivers/video/fbdev/omap2/omapfb/Kconfig        |    3 +-
 drivers/video/fbdev/omap2/omapfb/omapfb-sysfs.c |   18 +-
 drivers/video/fbdev/riva/riva_hw.c              |    3 +
 drivers/video/fbdev/sh_mobile_lcdcfb.c          |    5 +-
 drivers/video/fbdev/smscufx.c                   |    8 +-
 drivers/video/fbdev/vt8500lcdfb.c               |    5 +-
 drivers/video/logo/Kconfig                      |   82 +-
 drivers/video/logo/Makefile                     |   29 +-
 drivers/video/logo/logo.c                       |   46 +-
 drivers/video/logo/logo_mac_clut224.ppm         | 1604 -----------------------
 drivers/video/of_display_timing.c               |   10 +-
 include/linux/console.h                         |    1 -
 include/linux/fb.h                              |   13 +-
 include/linux/linux_logo.h                      |    8 -
 kernel/printk/printk.c                          |   16 -
 45 files changed, 324 insertions(+), 3256 deletions(-)
 delete mode 100644 drivers/video/fbdev/hyperv_fb.c
 delete mode 100644 drivers/video/logo/logo_mac_clut224.ppm

Re: [GIT PULL] fbdev fixes and updates for v7.0-rc1

[pr-tracker-bot]

The pull request you sent on Sat, 14 Feb 2026 13:06:38 +0100:

> http://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git tags/fbdev-for-7.0-rc1

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/8b3c75a39cc3cde78332f0e10898104a5e1e2807

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html

Re: [GIT PULL] fbdev fixes and updates for v7.0-rc1

[Helge Deller]

Hi Linus,

* pr-tracker-bot@kernel.org <pr-tracker-bot@kernel.org>:
> The pull request you sent on Sat, 14 Feb 2026 13:06:38 +0100:
> 
> > http://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git tags/fbdev-for-7.0-rc1
> 
> has been merged into torvalds/linux.git:
> https://git.kernel.org/torvalds/c/8b3c75a39cc3cde78332f0e10898104a5e1e2807


Linus, I'm really sorry, but I messed up drivers/gpu/drm/Kconfig while
trying to fix a merge conflict.
My patch series should not have touched drivers/gpu/drm/Kconfig at all.
That's purely my fault and not the fault of the patch author.

Can you please revert the changes done to drivers/gpu/drm/Kconfig by
commit 8f582bcd132c ("drm/hyperv: Remove reference to hyperv_fb
driver") or alternatively apply the patch below?

Thanks,
Helge



From ea47a4a9b1e9c0a665df5ef6e6b9bd3653c21d9e Mon Sep 17 00:00:00 2001
From: Helge Deller <deller@gmx.de>
Date: Sat, 14 Feb 2026 22:16:34 +0100
Subject: [PATCH] Partly revert "drm/hyperv: Remove reference to hyperv_fb
 driver"

This partly reverts commit 8f582bcd132cf1290e1fbd56b9f783dabe637dd4
which was messed up by me while trying to fix a merge conflict.

Signed-off-by: Helge Deller <deller@gmx.de>

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 65db9928439b..d3d52310c9cc 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -265,152 +265,6 @@ config DRM_SCHED
 	tristate
 	depends on DRM
 
-source "drivers/gpu/drm/sysfb/Kconfig"
-
-source "drivers/gpu/drm/arm/Kconfig"
-
-source "drivers/gpu/drm/radeon/Kconfig"
-
-source "drivers/gpu/drm/amd/amdgpu/Kconfig"
-
-source "drivers/gpu/drm/nouveau/Kconfig"
-
-source "drivers/gpu/drm/nova/Kconfig"
-
-source "drivers/gpu/drm/i915/Kconfig"
-
-source "drivers/gpu/drm/xe/Kconfig"
-
-source "drivers/gpu/drm/kmb/Kconfig"
-
-config DRM_VGEM
-	tristate "Virtual GEM provider"
-	depends on DRM && MMU
-	select DRM_GEM_SHMEM_HELPER
-	help
-	  Choose this option to get a virtual graphics memory manager,
-	  as used by Mesa's software renderer for enhanced performance.
-	  If M is selected the module will be called vgem.
-
-source "drivers/gpu/drm/vkms/Kconfig"
-
-source "drivers/gpu/drm/exynos/Kconfig"
-
-source "drivers/gpu/drm/rockchip/Kconfig"
-
-source "drivers/gpu/drm/vmwgfx/Kconfig"
-
-source "drivers/gpu/drm/gma500/Kconfig"
-
-source "drivers/gpu/drm/udl/Kconfig"
-
-source "drivers/gpu/drm/ast/Kconfig"
-
-source "drivers/gpu/drm/mgag200/Kconfig"
-
-source "drivers/gpu/drm/armada/Kconfig"
-
-source "drivers/gpu/drm/atmel-hlcdc/Kconfig"
-
-source "drivers/gpu/drm/renesas/Kconfig"
-
-source "drivers/gpu/drm/sun4i/Kconfig"
-
-source "drivers/gpu/drm/omapdrm/Kconfig"
-
-source "drivers/gpu/drm/tilcdc/Kconfig"
-
-source "drivers/gpu/drm/qxl/Kconfig"
-
-source "drivers/gpu/drm/virtio/Kconfig"
-
-source "drivers/gpu/drm/msm/Kconfig"
-
-source "drivers/gpu/drm/fsl-dcu/Kconfig"
-
-source "drivers/gpu/drm/tegra/Kconfig"
-
-source "drivers/gpu/drm/stm/Kconfig"
-
-source "drivers/gpu/drm/panel/Kconfig"
-
-source "drivers/gpu/drm/bridge/Kconfig"
-
-source "drivers/gpu/drm/sti/Kconfig"
-
-source "drivers/gpu/drm/imx/Kconfig"
-
-source "drivers/gpu/drm/ingenic/Kconfig"
-
-source "drivers/gpu/drm/v3d/Kconfig"
-
-source "drivers/gpu/drm/vc4/Kconfig"
-
-source "drivers/gpu/drm/loongson/Kconfig"
-
-source "drivers/gpu/drm/etnaviv/Kconfig"
-
-source "drivers/gpu/drm/hisilicon/Kconfig"
-
-source "drivers/gpu/drm/logicvc/Kconfig"
-
-source "drivers/gpu/drm/mediatek/Kconfig"
-
-source "drivers/gpu/drm/mxsfb/Kconfig"
-
-source "drivers/gpu/drm/meson/Kconfig"
-
-source "drivers/gpu/drm/tiny/Kconfig"
-
-source "drivers/gpu/drm/pl111/Kconfig"
-
-source "drivers/gpu/drm/tve200/Kconfig"
-
-source "drivers/gpu/drm/xen/Kconfig"
-
-source "drivers/gpu/drm/vboxvideo/Kconfig"
-
-source "drivers/gpu/drm/lima/Kconfig"
-
-source "drivers/gpu/drm/panfrost/Kconfig"
-
-source "drivers/gpu/drm/panthor/Kconfig"
-
-source "drivers/gpu/drm/aspeed/Kconfig"
-
-source "drivers/gpu/drm/mcde/Kconfig"
-
-source "drivers/gpu/drm/tidss/Kconfig"
-
-source "drivers/gpu/drm/adp/Kconfig"
-
-source "drivers/gpu/drm/xlnx/Kconfig"
-
-source "drivers/gpu/drm/gud/Kconfig"
-
-source "drivers/gpu/drm/sitronix/Kconfig"
-
-source "drivers/gpu/drm/solomon/Kconfig"
-
-source "drivers/gpu/drm/sprd/Kconfig"
-
-source "drivers/gpu/drm/imagination/Kconfig"
-
-source "drivers/gpu/drm/tyr/Kconfig"
-
-config DRM_HYPERV
-	tristate "DRM Support for Hyper-V synthetic video device"
-	depends on DRM && PCI && HYPERV_VMBUS
-	select DRM_CLIENT_SELECTION
-	select DRM_KMS_HELPER
-	select DRM_GEM_SHMEM_HELPER
-	help
-	 This is a KMS driver for Hyper-V synthetic video device. Choose this
-	 option if you would like to enable drm driver for Hyper-V virtual
-	 machine.
-
-	 If M is selected the module will be called hyperv_drm.
-
 # Separate option as not all DRM drivers use it
 config DRM_PANEL_BACKLIGHT_QUIRKS
 	tristate

Re: [GIT PULL] fbdev fixes and updates for v7.0-rc1

[Linus Torvalds]

[ Adding Kconfig maintainers and linux-kbuild list ]

On Sat, 14 Feb 2026 at 13:30, Helge Deller <deller@kernel.org> wrote:
>
> Linus, I'm really sorry, but I messed up drivers/gpu/drm/Kconfig while
> trying to fix a merge conflict.
> My patch series should not have touched drivers/gpu/drm/Kconfig at all.
> That's purely my fault and not the fault of the patch author.

Humm. Funky how the Kconfig parts never complained about the
duplication of all those source lines, so the problem was basically
entirely hidden and things still "worked" even though that Kconfig
file had been so messed up.

I'm not sure if the Kconfig tools could perhaps warn about this kind
of duplication - we might have some of it intentionally - but it does
make me go "Hmm".

Nathan, Nicolas, comments? See that commit ca4ee40bf13d for the
partial revert, and notice how Kconfig is entirely happy both before
and after that..

                Linus

Re: [GIT PULL] fbdev fixes and updates for v7.0-rc1

[Nathan Chancellor]

Hi Linus,

On Sat, Feb 14, 2026 at 02:47:47PM -0800, Linus Torvalds wrote:
> [ Adding Kconfig maintainers and linux-kbuild list ]
> 
> On Sat, 14 Feb 2026 at 13:30, Helge Deller <deller@kernel.org> wrote:
> >
> > Linus, I'm really sorry, but I messed up drivers/gpu/drm/Kconfig while
> > trying to fix a merge conflict.
> > My patch series should not have touched drivers/gpu/drm/Kconfig at all.
> > That's purely my fault and not the fault of the patch author.
> 
> Humm. Funky how the Kconfig parts never complained about the
> duplication of all those source lines, so the problem was basically
> entirely hidden and things still "worked" even though that Kconfig
> file had been so messed up.
> 
> I'm not sure if the Kconfig tools could perhaps warn about this kind
> of duplication - we might have some of it intentionally - but it does
> make me go "Hmm".
> 
> Nathan, Nicolas, comments? See that commit ca4ee40bf13d for the
> partial revert, and notice how Kconfig is entirely happy both before
> and after that..

It seems like we should be able to check if we have seen an sourced
Kconfig already, presumably somewhere in or around zconf_nextfile() in
scripts/kconfig/lexer.l. Not sure how complicated it will be, I will see
if I can wire something like that up during the next development cycle
(amongst the other things on my plate). Given how wonky that looks in
menuconfig and the like, maybe it is worth making that a hard error.

Cheers,
Nathan