Merge tag 'fbdev-v5.2' of git://github.com/bzolnier/linux
Pull fbdev updates from Bartlomiej Zolnierkiewicz: "Four small fixes for fb core, updates for udlfb, sm712fb, macfb and atafb drivers. Redundant code removals from amba-clcd and atmel_lcdfb drivers. Minor fixes/cleanups for other fb drivers Detailed summary: - fix regression in fbcon logo handling on 'quiet' boots (Andreas Schwab) - fix divide-by-zero error in fb_var_to_videomode() (Shile Zhang) - fix 'WARNING in __alloc_pages_nodemask' bug (Jiufei Xue) - list all PCI memory BARs as conflicting apertures (Gerd Hoffmann) - update udlfb driver: fix sleeping inside spinlock, add mutex around rendering calls and remove redundant code (Mikulas Patocka) - update sm712fb driver: fix SM720 support related issues (Yifeng Li) - update macfb driver: fix DAFB colour table pointer initialization and remove redundant code (Finn Thain) - update atafb driver: fix kexec support, use dev_*() calls instead of printk() and remove obsolete module support (Geert Uytterhoeven) - add support to mxsfb driver for skipping display initialization for flicker-free display takeover from bootloader (Melchior Franz) - remove Versatile and Nomadik board families support from amba-clcd driver as they are handled by DRM driver nowadays (Linus Walleij) - remove no longer needed AVR and platform_data support from atmel_lcdfb driver (Alexandre Belloni) - misc fixes (Colin Ian King, Julia Lawall, Gustavo A. R. Silva, Aditya Pakki, Kangjie Lu, YueHaibing) - misc cleanups (Enrico Weigelt, Kefeng Wang)" * tag 'fbdev-v5.2' of git://github.com/bzolnier/linux: (38 commits) video: fbdev: Use dev_get_drvdata() fbcon: Don't reset logo_shown when logo is currently shown video: fbdev: atmel_lcdfb: remove set but not used variable 'pdata' video: fbdev: mxsfb: remove set but not used variable 'line_count' video: fbdev: pvr2fb: remove set but not used variable 'size' fbdev: fix WARNING in __alloc_pages_nodemask bug video: amba-clcd: Decomission Versatile and Nomadik fbdev: sm712fb: fix memory frequency by avoiding a switch/case fallthrough fbdev: fix divide error in fb_var_to_videomode fbdev: sm712fb: use 1024x768 by default on non-MIPS, fix garbled display fbdev: sm712fb: fix support for 1024x768-16 mode fbdev: sm712fb: fix crashes and garbled display during DPMS modesetting fbdev: sm712fb: fix crashes during framebuffer writes by correctly mapping VRAM fbdev: sm712fb: fix boot screen glitch when sm712fb replaces VGA fbdev: sm712fb: fix VRAM detection, don't set SR70/71/74/75 fbdev: sm712fb: fix brightness control on reboot, don't set SR30 fbdev: sm712fb: fix white screen of death on reboot, don't set CR3B-CR3F video: imsttfb: fix potential NULL pointer dereferences video: hgafb: fix potential NULL pointer dereference fbdev: list all pci memory bars as conflicting apertures ...
No related branches found
No related tags found
Showing
- drivers/video/fbdev/Kconfig 148 additions, 156 deletionsdrivers/video/fbdev/Kconfig
- drivers/video/fbdev/Makefile 0 additions, 2 deletionsdrivers/video/fbdev/Makefile
- drivers/video/fbdev/amba-clcd-nomadik.c 0 additions, 251 deletionsdrivers/video/fbdev/amba-clcd-nomadik.c
- drivers/video/fbdev/amba-clcd-nomadik.h 0 additions, 24 deletionsdrivers/video/fbdev/amba-clcd-nomadik.h
- drivers/video/fbdev/amba-clcd-versatile.c 0 additions, 567 deletionsdrivers/video/fbdev/amba-clcd-versatile.c
- drivers/video/fbdev/amba-clcd-versatile.h 0 additions, 17 deletionsdrivers/video/fbdev/amba-clcd-versatile.h
- drivers/video/fbdev/amba-clcd.c 2 additions, 96 deletionsdrivers/video/fbdev/amba-clcd.c
- drivers/video/fbdev/atafb.c 40 additions, 27 deletionsdrivers/video/fbdev/atafb.c
- drivers/video/fbdev/atafb_iplan2p2.c 0 additions, 23 deletionsdrivers/video/fbdev/atafb_iplan2p2.c
- drivers/video/fbdev/atafb_iplan2p4.c 0 additions, 23 deletionsdrivers/video/fbdev/atafb_iplan2p4.c
- drivers/video/fbdev/atafb_iplan2p8.c 0 additions, 23 deletionsdrivers/video/fbdev/atafb_iplan2p8.c
- drivers/video/fbdev/atafb_mfb.c 0 additions, 23 deletionsdrivers/video/fbdev/atafb_mfb.c
- drivers/video/fbdev/atmel_lcdfb.c 4 additions, 112 deletionsdrivers/video/fbdev/atmel_lcdfb.c
- drivers/video/fbdev/core/fbcmap.c 2 additions, 0 deletionsdrivers/video/fbdev/core/fbcmap.c
- drivers/video/fbdev/core/fbcon.c 1 addition, 1 deletiondrivers/video/fbdev/core/fbcon.c
- drivers/video/fbdev/core/fbmem.c 25 additions, 4 deletionsdrivers/video/fbdev/core/fbmem.c
- drivers/video/fbdev/core/modedb.c 3 additions, 0 deletionsdrivers/video/fbdev/core/modedb.c
- drivers/video/fbdev/hgafb.c 2 additions, 0 deletionsdrivers/video/fbdev/hgafb.c
- drivers/video/fbdev/imsttfb.c 5 additions, 0 deletionsdrivers/video/fbdev/imsttfb.c
- drivers/video/fbdev/macfb.c 2 additions, 27 deletionsdrivers/video/fbdev/macfb.c
Loading
Please register or sign in to comment