[GIT PULL] fbdev changes for v5.3
From: Bartlomiej Zolnierkiewicz <hidden>
Date: 2019-07-09 13:10:35
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