Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d41ef54 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fbdev-v5.3' of git://github.com/bzolnier/linux 

Pull fbdev updates from Bartlomiej Zolnierkiewicz:

 - 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)

* tag 'fbdev-v5.3' of git://github.com/bzolnier/linux: (62 commits)
  video: fbdev: imxfb: fix a typo in imxfb_probe()
  video: fbdev: s3c-fb: Mark expected switch fall-throughs
  video: fbdev: s3c-fb: fix sparse warnings about using incorrect types
  video: fbdev: don't print error message on framebuffer_alloc() failure
  video: fbdev: intelfb: return -ENOMEM on framebuffer_alloc() failure
  video: fbdev: s3c-fb: return -ENOMEM on framebuffer_alloc() failure
  vga_switcheroo: Depend upon fbcon being built-in, if enabled
  video: fbdev: omap2: remove rfbi
  video: fbdev: atmel_lcdfb: remove redundant initialization to variable ret
  video: fbdev-MMP: Use struct_size() in devm_kzalloc()
  video: fbdev: controlfb: fix warnings about comparing pointer to 0
  efifb: BGRT: Add check for new BGRT status field rotation bits
  jz4740_fb: fix DMA API abuse
  video: fbdev: pvr2fb: fix link error for pvr2fb_pci_exit
  video: fbdev: s3c-fb: add COMPILE_TEST support
  video: fbdev: imxfb: fix sparse warnings about using incorrect types
  video: fbdev: pvr2fb: fix build warning when compiling as module
  fbcon: Export fbcon_update_vcs
  backlight: simplify lcd notifier
  staging/olpc_dcon: Add drm conversion to TODO
  ...
parents ed63b9c8 732146a3

arch/arm/mach-pxa/am200epd.c

+11 −2
Original line number Diff line number Diff line
@@ -347,8 +347,17 @@ int __init am200_init(void) 
{

	int ret;



	/* before anything else, we request notification for any fb

	 * creation events */

	/*

	 * Before anything else, we request notification for any fb

	 * creation events.

	 *

	 * FIXME: This is terrible and needs to be nuked. The notifier is used

	 * to get at the fb base address from the boot splash fb driver, which

	 * is then passed to metronomefb. Instaed of metronomfb or this board

	 * support file here figuring this out on their own.

	 *

	 * See also the #ifdef in fbmem.c.

	 */

	fb_register_client(&am200_fb_notif);



	pxa2xx_mfp_config(ARRAY_AND_SIZE(am200_pin_config));

drivers/gpu/vga/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ config VGA_SWITCHEROO 
	depends on X86

	depends on ACPI

	depends on PCI

	depends on (FRAMEBUFFER_CONSOLE=n || FB=y)

	select VGA_ARB

	help

	  Many laptops released in 2008/9/10 have two GPUs with a multiplexer

drivers/gpu/vga/vga_switcheroo.c

+3 −8
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <linux/debugfs.h>

#include <linux/fb.h>

#include <linux/fs.h>

#include <linux/fbcon.h>

#include <linux/module.h>

#include <linux/pci.h>

#include <linux/pm_domain.h>
@@ -736,14 +737,8 @@ static int vga_switchto_stage2(struct vga_switcheroo_client *new_client) 
	if (!active->driver_power_control)

		set_audio_state(active->id, VGA_SWITCHEROO_OFF);



	if (new_client->fb_info) {

		struct fb_event event;



		console_lock();

		event.info = new_client->fb_info;

		fb_notifier_call_chain(FB_EVENT_REMAP_ALL_CONSOLE, &event);

		console_unlock();

	}

	if (new_client->fb_info)

		fbcon_remap_all(new_client->fb_info);



	mutex_lock(&vgasr_priv.mux_hw_lock);

	ret = vgasr_priv.handler->switchto(new_client->id);

drivers/hid/hid-picolcd_fb.c

+1 −3
Original line number Diff line number Diff line
@@ -512,10 +512,8 @@ int picolcd_init_framebuffer(struct picolcd_data *data) 
			sizeof(struct fb_deferred_io) +

			sizeof(struct picolcd_fb_data) +

			PICOLCDFB_SIZE, dev);

	if (info == NULL) {

		dev_err(dev, "failed to allocate a framebuffer\n");

	if (!info)

		goto err_nomem;

	}



	info->fbdefio = info->par;

	*info->fbdefio = picolcd_fb_defio;

drivers/media/pci/ivtv/ivtvfb.c

+1 −5
Original line number Diff line number Diff line
@@ -1256,11 +1256,7 @@ static int ivtvfb_callback_cleanup(struct device *dev, void *p) 
		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);