Skip to content

Commit 8b3c75a

Browse files
torvaldstorvalds
committed
Merge tag 'fbdev-for-7.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev
Pull fbdev updates from Helge Deller: "It's now easily possible to replace the framebuffer penguin boot logo with an own logo at compile time (Vincent Mailhol) 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 are no longer necessary. 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" * tag 'fbdev-for-7.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev: (32 commits) fbcon: Declare struct fb_info.fbcon_par as of type struct fbcon_par fbcon: Remove struct fbcon_display.inverse fbdev: au1200fb: Fix a memory leak in au1200fb_drv_probe() fbdev: ffb: fix corrupted video output on Sun FFB1 fbdev: of_display_timing: Fix device node reference leak in of_get_display_timings() staging: fbtft: Make framebuffer registration message debug-only staging: fbtft: Fix build failure when CONFIG_FB_DEVICE=n fbdev: au1100fb: Check return value of clk_enable() in .resume() printk, vt, fbcon: Remove console_conditional_schedule() fbdev: fix fb_pad_unaligned_buffer mask fbdev: of: display_timing: fix refcount leak in of_get_display_timings() fbdev: vt8500lcdfb: fix missing dma_free_coherent() video/logo: don't select LOGO_LINUX_MONO and LOGO_LINUX_VGA16 by default video/logo: move logo selection logic to Kconfig video/logo: remove logo_mac_clut224 sh: defconfig: remove CONFIG_LOGO_SUPERH_* newport_con: depend on LOGO_LINUX_CLUT224 instead of LOGO_SGI_CLUT224 video/logo: allow custom logo video/logo: add a type parameter to the logo makefile function video/logo: remove orphan .pgm Makefile rule ...
2 parents 6179d7a + a86039b commit 8b3c75a

45 files changed

Lines changed: 324 additions & 3256 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎MAINTAINERS‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11859,16 +11859,6 @@ F: include/uapi/linux/hyperv.h
1185911859
F: net/vmw_vsock/hyperv_transport.c
1186011860
F: tools/hv/
1186111861

11862-
HYPER-V FRAMEBUFFER DRIVER
11863-
M: "K. Y. Srinivasan" <kys@microsoft.com>
11864-
M: Haiyang Zhang <haiyangz@microsoft.com>
11865-
M: Wei Liu <wei.liu@kernel.org>
11866-
M: Dexuan Cui <decui@microsoft.com>
11867-
L: linux-hyperv@vger.kernel.org
11868-
S: Obsolete
11869-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git
11870-
F: drivers/video/fbdev/hyperv_fb.c
11871-
1187211862
HYPERBUS SUPPORT
1187311863
M: Vignesh Raghavendra <vigneshr@ti.com>
1187411864
R: Tudor Ambarus <tudor.ambarus@linaro.org>

‎arch/sh/configs/dreamcast_defconfig‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ CONFIG_LOGO=y
6060
# CONFIG_LOGO_LINUX_MONO is not set
6161
# CONFIG_LOGO_LINUX_VGA16 is not set
6262
# CONFIG_LOGO_LINUX_CLUT224 is not set
63-
# CONFIG_LOGO_SUPERH_MONO is not set
64-
# CONFIG_LOGO_SUPERH_VGA16 is not set
6563
# CONFIG_DNOTIFY is not set
6664
CONFIG_PROC_KCORE=y
6765
CONFIG_TMPFS=y

‎arch/sh/configs/ecovec24_defconfig‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,6 @@ CONFIG_LOGO=y
7878
# CONFIG_LOGO_LINUX_MONO is not set
7979
# CONFIG_LOGO_LINUX_VGA16 is not set
8080
# CONFIG_LOGO_LINUX_CLUT224 is not set
81-
# CONFIG_LOGO_SUPERH_MONO is not set
82-
# CONFIG_LOGO_SUPERH_VGA16 is not set
8381
CONFIG_SOUND=y
8482
CONFIG_SND=y
8583
CONFIG_SND_SEQUENCER=y

‎arch/sh/configs/kfr2r09_defconfig‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@ CONFIG_LOGO=y
6666
# CONFIG_LOGO_LINUX_MONO is not set
6767
# CONFIG_LOGO_LINUX_VGA16 is not set
6868
# CONFIG_LOGO_LINUX_CLUT224 is not set
69-
# CONFIG_LOGO_SUPERH_MONO is not set
70-
# CONFIG_LOGO_SUPERH_CLUT224 is not set
7169
CONFIG_USB_GADGET=y
7270
CONFIG_USB_CDC_COMPOSITE=m
7371
CONFIG_MMC=y

‎arch/sh/configs/migor_defconfig‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,6 @@ CONFIG_LOGO=y
7171
# CONFIG_LOGO_LINUX_MONO is not set
7272
# CONFIG_LOGO_LINUX_VGA16 is not set
7373
# CONFIG_LOGO_LINUX_CLUT224 is not set
74-
# CONFIG_LOGO_SUPERH_MONO is not set
75-
# CONFIG_LOGO_SUPERH_CLUT224 is not set
7674
CONFIG_USB_GADGET=y
7775
CONFIG_USB_GADGET_M66592=y
7876
CONFIG_USB_G_SERIAL=m

‎arch/sh/configs/rts7751r2d1_defconfig‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ CONFIG_LOGO=y
5050
# CONFIG_LOGO_LINUX_MONO is not set
5151
# CONFIG_LOGO_LINUX_VGA16 is not set
5252
# CONFIG_LOGO_LINUX_CLUT224 is not set
53-
# CONFIG_LOGO_SUPERH_MONO is not set
54-
# CONFIG_LOGO_SUPERH_VGA16 is not set
5553
CONFIG_SOUND=y
5654
CONFIG_SND=m
5755
CONFIG_SND_YMFPCI=m

‎arch/sh/configs/rts7751r2dplus_defconfig‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ CONFIG_LOGO=y
5555
# CONFIG_LOGO_LINUX_MONO is not set
5656
# CONFIG_LOGO_LINUX_VGA16 is not set
5757
# CONFIG_LOGO_LINUX_CLUT224 is not set
58-
# CONFIG_LOGO_SUPERH_MONO is not set
59-
# CONFIG_LOGO_SUPERH_VGA16 is not set
6058
CONFIG_SOUND=y
6159
CONFIG_SND=m
6260
CONFIG_SND_YMFPCI=m

‎arch/sh/configs/se7724_defconfig‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,6 @@ CONFIG_LOGO=y
7979
# CONFIG_LOGO_LINUX_MONO is not set
8080
# CONFIG_LOGO_LINUX_VGA16 is not set
8181
# CONFIG_LOGO_LINUX_CLUT224 is not set
82-
# CONFIG_LOGO_SUPERH_MONO is not set
83-
# CONFIG_LOGO_SUPERH_VGA16 is not set
8482
CONFIG_SOUND=y
8583
CONFIG_SND=m
8684
# CONFIG_SND_DRIVERS is not set

‎arch/sh/configs/se7780_defconfig‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
6666
CONFIG_LOGO=y
6767
# CONFIG_LOGO_LINUX_MONO is not set
6868
# CONFIG_LOGO_LINUX_VGA16 is not set
69-
# CONFIG_LOGO_SUPERH_MONO is not set
70-
# CONFIG_LOGO_SUPERH_VGA16 is not set
7169
CONFIG_SOUND=y
7270
CONFIG_SOUND_PRIME=y
7371
CONFIG_HID_A4TECH=y

‎arch/sh/configs/sh7785lcr_defconfig‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
6060
CONFIG_LOGO=y
6161
# CONFIG_LOGO_LINUX_MONO is not set
6262
# CONFIG_LOGO_LINUX_VGA16 is not set
63-
# CONFIG_LOGO_SUPERH_MONO is not set
64-
# CONFIG_LOGO_SUPERH_VGA16 is not set
65-
# CONFIG_LOGO_SUPERH_CLUT224 is not set
6663
CONFIG_HID_A4TECH=y
6764
CONFIG_HID_APPLE=y
6865
CONFIG_HID_BELKIN=y

0 commit comments

Comments
 (0)