Hi Linus,
Please pull fbdev changes for v5.3. They are:
- removal of fbdev notifier usage for fbcon
- COMPILE_TEST support for more fb drivers
- removal of no longer needed fbdev mxsfb driver
- minor fixes/cleanups for other fb drivers
Please see the signed tag description for details.
Test merge revealed a small merge conflict with SPDX changes, the
resolution is trivial (drivers/video/fbdev/omap2/omapfb/dss/rfbi.c
should be deleted).
Also there is a conflict with media tree (pull request for media
tree has been posted a bit earlier today by Mauro), a fix for it
has been carried in linux-next tree by Stephen:
diff --cc drivers/media/pci/ivtv/ivtvfb.c
index 800b3654cac5,299ff032f528..000000000000
--- a/drivers/media/pci/ivtv/ivtvfb.c
+++ b/drivers/media/pci/ivtv/ivtvfb.c
@@@ -1251,16 -1246,7 +1251,12 @@@ static int ivtvfb_callback_cleanup(stru
struct osd_info *oi = itv->osd_info;
if (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT) {
+ itv->streams[IVTV_DEC_STREAM_TYPE_YUV].vdev.device_caps &=
+ ~V4L2_CAP_VIDEO_OUTPUT_OVERLAY;
+ itv->streams[IVTV_DEC_STREAM_TYPE_MPG].vdev.device_caps &=
+ ~V4L2_CAP_VIDEO_OUTPUT_OVERLAY;
+ itv->v4l2_cap &= ~V4L2_CAP_VIDEO_OUTPUT_OVERLAY;
- if (unregister_framebuffer(&itv->osd_info->ivtvfb_info)) {
- IVTVFB_WARN("Framebuffer %d is in use, cannot unload\n",
- itv->instance);
- return 0;
- }
+ unregister_framebuffer(&itv->osd_info->ivtvfb_info);
IVTVFB_INFO("Unregister framebuffer %d\n", itv->instance);
itv->ivtvfb_restore = NULL;
ivtvfb_blank(FB_BLANK_VSYNC_SUSPEND, &oi->ivtvfb_info);
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
The following changes since commit d1fdb6d8f6a4109a4263176c84b899076a5f8008:
Linux 5.2-rc4 (2019-06-08 20:24:46 -0700)
are available in the git repository at:
https://github.com/bzolnier/linux.git tags/fbdev-v5.3
for you to fetch changes up to 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f:
video: fbdev: imxfb: fix a typo in imxfb_probe() (2019-07-05 17:42:13 +0200)
----------------------------------------------------------------
fbdev changes for v5.3:
- remove fbdev notifier usage for fbcon (as prep work to clean up the fbcon
locking), add locking checks in vt/console code and make assorted cleanups
in fbdev and backlight code (Daniel Vetter)
- add COMPILE_TEST support to atmel_lcdfb, da8xx-fb, gbefb, imxfb, pvr2fb and
pxa168fb drivers (me)
- fix DMA API abuse in au1200fb and jz4740_fb drivers (Christoph Hellwig)
- add check for new BGRT status field rotation bits in efifb driver (Hans de
Goede)
- mark expected switch fall-throughs in s3c-fb driver (Gustavo A. R. Silva)
- remove fbdev mxsfb driver in favour of the drm version (Fabio Estevam)
- remove broken rfbi code from omap2fb driver (me)
- misc fixes (Arnd Bergmann, Shobhit Kukreti, Wei Yongjun, me)
- misc cleanups (Gustavo A. R. Silva, Colin Ian King, me)
----------------------------------------------------------------
Arnd Bergmann (1):
video: fbdev: pvr2fb: fix link error for pvr2fb_pci_exit
Bartlomiej Zolnierkiewicz (21):
Merge tag 'v5.2-rc1' of https://git.kernel.org/.../torvalds/linux into fbdev-for-next
video: fbdev: atafb: remove superfluous function prototypes
video: fbdev: atmel_lcdfb: add COMPILE_TEST support
video: fbdev: imxfb: add COMPILE_TEST support
video: fbdev: pxa168fb: add COMPILE_TEST support
video: fbdev: gbefb: add COMPILE_TEST support
video: fbdev: da8xx-fb: add COMPILE_TEST support
video: fbdev: cyber2000fb: remove superfluous CONFIG_PCI ifdef
video: fbdev: pvr2fb: remove function prototypes
video: fbdev: pvr2fb: add COMPILE_TEST support
Merge tag 'topic/remove-fbcon-notifiers-2019-06-14-1' of git://anongit.freedesktop.org/drm/drm-misc into fbdev-for-next
Merge branch 'topic/remove-fbcon-notifiers' of git://anongit.freedesktop.org/drm/drm-misc into fbdev-for-next
video: fbdev: pvr2fb: fix build warning when compiling as module
video: fbdev: imxfb: fix sparse warnings about using incorrect types
video: fbdev: s3c-fb: add COMPILE_TEST support
video: fbdev: omap2: remove rfbi
Merge tag 'topic/remove-fbcon-notifiers-2019-06-26' of git://anongit.freedesktop.org/drm/drm-misc into fbdev-for-next
video: fbdev: s3c-fb: return -ENOMEM on framebuffer_alloc() failure
video: fbdev: intelfb: return -ENOMEM on framebuffer_alloc() failure
video: fbdev: don't print error message on framebuffer_alloc() failure
video: fbdev: s3c-fb: fix sparse warnings about using incorrect types
Christoph Hellwig (2):
au1200fb: fix DMA API abuse
jz4740_fb: fix DMA API abuse
Colin Ian King (1):
video: fbdev: atmel_lcdfb: remove redundant initialization to variable ret
Daniel Vetter (35):
dummycon: Sprinkle locking checks
fbdev: locking check for fb_set_suspend
vt: might_sleep() annotation for do_blank_screen
vt: More locking checks
fbdev/sa1100fb: Remove dead code
fbdev/cyber2000: Remove struct display
fbdev/aty128fb: Remove dead code
fbcon: s/struct display/struct fbcon_display/
fbcon: Remove fbcon_has_exited
fbcon: call fbcon_fb_(un)registered directly
fbdev/sh_mobile: remove sh_mobile_lcdc_display_notify
fbdev/omap: sysfs files can't disappear before the device is gone
fbdev: sysfs files can't disappear before the device is gone
staging/olpc: lock_fb_info can't fail
fbdev/atyfb: lock_fb_info can't fail
fbdev: lock_fb_info cannot fail
fbcon: call fbcon_fb_bind directly
fbdev: make unregister/unlink functions not fail
fbdev: unify unlink_framebuffer paths
fbdev/sh_mob: Remove fb notifier callback
fbdev: directly call fbcon_suspended/resumed
fbcon: Call fbcon_mode_deleted/new_modelist directly
fbdev: Call fbcon_get_requirement directly
Revert "backlight/fbcon: Add FB_EVENT_CONBLANK"
fbmem: pull fbcon_fb_blanked out of fb_blank
fbdev: remove FBINFO_MISC_USEREVENT around fb_blank
fb: Flatten control flow in fb_set_var
fbcon: replace FB_EVENT_MODE_CHANGE/_ALL with direct calls
vgaswitcheroo: call fbcon_remap_all directly
fbcon: Call con2fb_map functions directly
fbcon: Document what I learned about fbcon locking
staging/olpc_dcon: Add drm conversion to TODO
backlight: simplify lcd notifier
fbcon: Export fbcon_update_vcs
vga_switcheroo: Depend upon fbcon being built-in, if enabled
Fabio Estevam (1):
video: fbdev: mxsfb: Remove driver
Gustavo A. R. Silva (2):
video: fbdev-MMP: Use struct_size() in devm_kzalloc()
video: fbdev: s3c-fb: Mark expected switch fall-throughs
Hans de Goede (1):
efifb: BGRT: Add check for new BGRT status field rotation bits
Shobhit Kukreti (1):
video: fbdev: controlfb: fix warnings about comparing pointer to 0
Wei Yongjun (1):
video: fbdev: imxfb: fix a typo in imxfb_probe()
arch/arm/mach-pxa/am200epd.c | 13 +-
drivers/gpu/vga/Kconfig | 1 +
drivers/gpu/vga/vga_switcheroo.c | 11 +-
drivers/hid/hid-picolcd_fb.c | 4 +-
drivers/media/pci/ivtv/ivtvfb.c | 6 +-
drivers/staging/fbtft/fbtft-core.c | 4 +-
drivers/staging/olpc_dcon/TODO | 7 +
drivers/staging/olpc_dcon/olpc_dcon.c | 6 +-
drivers/tty/vt/vt.c | 18 +
drivers/video/backlight/backlight.c | 2 +-
drivers/video/backlight/lcd.c | 12 -
drivers/video/console/dummycon.c | 6 +
drivers/video/fbdev/Kconfig | 34 +-
drivers/video/fbdev/Makefile | 1 -
drivers/video/fbdev/amifb.c | 4 +-
drivers/video/fbdev/arkfb.c | 4 +-
drivers/video/fbdev/atafb.c | 21 -
drivers/video/fbdev/atmel_lcdfb.c | 10 +-
drivers/video/fbdev/aty/aty128fb.c | 69 +-
drivers/video/fbdev/aty/atyfb_base.c | 13 +-
drivers/video/fbdev/aty/radeon_base.c | 2 -
drivers/video/fbdev/au1200fb.c | 19 +-
drivers/video/fbdev/chipsfb.c | 1 -
drivers/video/fbdev/cirrusfb.c | 5 +-
drivers/video/fbdev/controlfb.c | 8 +-
drivers/video/fbdev/core/fbcmap.c | 6 +-
drivers/video/fbdev/core/fbcon.c | 314 +++----
drivers/video/fbdev/core/fbcon.h | 6 +-
drivers/video/fbdev/core/fbmem.c | 399 +++------
drivers/video/fbdev/core/fbsysfs.c | 20 +-
drivers/video/fbdev/cyber2000fb.c | 6 -
drivers/video/fbdev/da8xx-fb.c | 1 -
drivers/video/fbdev/efifb.c | 6 +-
drivers/video/fbdev/gbefb.c | 19 +-
drivers/video/fbdev/grvga.c | 4 +-
drivers/video/fbdev/gxt4500.c | 5 +-
drivers/video/fbdev/hyperv_fb.c | 4 +-
drivers/video/fbdev/i740fb.c | 4 +-
drivers/video/fbdev/imsttfb.c | 5 +-
drivers/video/fbdev/imxfb.c | 11 +-
drivers/video/fbdev/intelfb/intelfbdrv.c | 7 +-
drivers/video/fbdev/jz4740_fb.c | 11 +-
drivers/video/fbdev/mb862xx/mb862xxfbdrv.c | 5 +-
drivers/video/fbdev/mbx/mbxfb.c | 4 +-
drivers/video/fbdev/mmp/hw/mmp_ctrl.c | 8 +-
drivers/video/fbdev/mxsfb.c | 1028 ---------------------
drivers/video/fbdev/neofb.c | 9 +-
drivers/video/fbdev/omap/omapfb_main.c | 2 -
drivers/video/fbdev/omap2/omapfb/dss/Kconfig | 12 -
drivers/video/fbdev/omap2/omapfb/dss/Makefile | 1 -
drivers/video/fbdev/omap2/omapfb/dss/core.c | 6 -
drivers/video/fbdev/omap2/omapfb/dss/dss.h | 4 -
drivers/video/fbdev/omap2/omapfb/dss/rfbi.c | 1078 -----------------------
drivers/video/fbdev/omap2/omapfb/omapfb-main.c | 6 +-
drivers/video/fbdev/omap2/omapfb/omapfb-sysfs.c | 21 +-
drivers/video/fbdev/platinumfb.c | 5 +-
drivers/video/fbdev/pmag-aa-fb.c | 4 +-
drivers/video/fbdev/pmag-ba-fb.c | 4 +-
drivers/video/fbdev/pmagb-b-fb.c | 4 +-
drivers/video/fbdev/pvr2fb.c | 188 ++--
drivers/video/fbdev/riva/fbdev.c | 1 -
drivers/video/fbdev/s3c-fb.c | 24 +-
drivers/video/fbdev/s3fb.c | 4 +-
drivers/video/fbdev/sa1100fb.c | 25 -
drivers/video/fbdev/savage/savagefb_driver.c | 9 +-
drivers/video/fbdev/sh_mobile_lcdcfb.c | 140 +--
drivers/video/fbdev/sh_mobile_lcdcfb.h | 5 -
drivers/video/fbdev/sm501fb.c | 4 +-
drivers/video/fbdev/sm712fb.c | 1 -
drivers/video/fbdev/smscufx.c | 4 +-
drivers/video/fbdev/ssd1307fb.c | 4 +-
drivers/video/fbdev/sunxvr1000.c | 1 -
drivers/video/fbdev/sunxvr2500.c | 1 -
drivers/video/fbdev/sunxvr500.c | 1 -
drivers/video/fbdev/tgafb.c | 4 +-
drivers/video/fbdev/udlfb.c | 4 +-
drivers/video/fbdev/via/viafbdev.c | 6 +-
drivers/video/fbdev/vt8623fb.c | 4 +-
include/linux/console_struct.h | 5 +-
include/linux/fb.h | 45 +-
include/linux/fbcon.h | 30 +
include/video/omapfb_dss.h | 32 -
82 files changed, 582 insertions(+), 3270 deletions(-)
delete mode 100644 drivers/video/fbdev/mxsfb.c
delete mode 100644 drivers/video/fbdev/omap2/omapfb/dss/rfbi.c
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
