Commit 4892c6f7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fbdev-v4.12' of git://github.com/bzolnier/linux 

Pull fbdev updates from Bartlomiej Zolnierkiewicz:
 "There is nothing really major here, just a couple of small bugfixes,
  improvements and cleanups.

   - fix handling of probing errors in omapfb (Arvind Yadav)

   - remove incorrect __exit markups in few drivers (Dmitry Torokhov)

   - fix boot time logo support for drivers using deferred probe
     (Takeshi Kihara)

   - fix DMA allocation size for ARM CLCD driver (Liam Beguin)

   - add support for specifying size via xenstore in xen-frontfb
     (Juergen Gross)

   - support for AUS mode in imxfb driver (Martin Kaiser)

   - fix buffer on stack usage in udlfb driver (Maksim Salau)

   - probe failure path fixup in sm501fb driver (Alexey Khoroshilov)

   - fix config dependency loop for stifb driver (Arnd Bergmann)

   - misc cleanups (Joe Perches, Christophe Leroy, Karim Eshapa, Pushkar
     Jambhlekar)"

* tag 'fbdev-v4.12' of git://github.com/bzolnier/linux:
  fbdev: sti: don't select CONFIG_VT
  drivers/video/fbdev/omap/lcd_mipid.c: Use time comparison kernel macros
  sm501fb: don't return zero on failure path in sm501fb_start()
  video: fbdev: udlfb: Fix buffer on stack
  video: console: Remove reference to CONFIG_8xx
  dt-bindings: display: imx: entry for AUS mode
  video: fbdev: imxfb: support AUS mode
  drivers/video/fbdev: Fixing coding guidelines in acornfb.c
  xen, fbfront: add support for specifying size via xenstore
  video: ARM CLCD: fix dma allocation size
  drivers/video: Convert remaining uses of pr_warning to pr_warn
  video/logo: tidyup fb_logo_late_init initcall timing
  video: fbdev: i810: remove incorrect __exit markups
  video: fbdev: pmag-aa-fb: remove incorrect __exit markups
  video: fbdev: pmagb-b-fb: remove incorrect __exit markups
  video: fbdev: pmag-ba-fb: remove incorrect __exit markups
  omapfb: dss: Handle return errors in dss_init_ports()
parents 55a1ab56 34bf129a

Documentation/devicetree/bindings/display/imx/fsl,imx-fb.txt

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ Required nodes: 
	Additional, the display node has to define properties:

	- bits-per-pixel: Bits per pixel

	- fsl,pcr: LCDC PCR value

	A display node may optionally define

	- fsl,aus-mode: boolean to enable AUS mode (only for imx21)



Optional properties:

- lcd-supply: Regulator for LCD supply voltage.

drivers/video/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ obj-$(CONFIG_VGASTATE) += vgastate.o 
obj-$(CONFIG_HDMI)                += hdmi.o



obj-$(CONFIG_VT)		  += console/

obj-$(CONFIG_FB_STI)		  += console/

obj-$(CONFIG_LOGO)		  += logo/

obj-y				  += backlight/

drivers/video/console/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ menu "Console display driver support" 


config VGA_CONSOLE

	bool "VGA text console" if EXPERT || !X86

	depends on !4xx && !8xx && !SPARC && !M68K && !PARISC && !FRV && \

	depends on !4xx && !PPC_8xx && !SPARC && !M68K && !PARISC && !FRV && \

		!SUPERH && !BLACKFIN && !AVR32 && !MN10300 && !CRIS && \

		(!ARM || ARCH_FOOTBRIDGE || ARCH_INTEGRATOR || ARCH_NETWINDER) && \

		!ARM64 && !ARC && !MICROBLAZE && !OPENRISC

drivers/video/fbdev/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -689,8 +689,6 @@ config FB_STI 
	select FB_CFB_FILLRECT

	select FB_CFB_COPYAREA

	select FB_CFB_IMAGEBLIT

	select STI_CONSOLE

	select VT

	default y

	---help---

	  STI refers to the HP "Standard Text Interface" which is a set of

drivers/video/fbdev/acornfb.c

+5 −7
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ extern unsigned int vram_size; /* set by setup.c */ 
#ifdef HAS_VIDC20

#include <mach/acornfb.h>



#define MAX_SIZE	2*1024*1024

#define MAX_SIZE	(2*1024*1024)



/* VIDC20 has a different set of rules from the VIDC:

 *  hcr  : must be multiple of 4
@@ -1043,8 +1043,7 @@ static int acornfb_probe(struct platform_device *dev) 
		base = dma_alloc_wc(current_par.dev, size, &handle,

				    GFP_KERNEL);

		if (base == NULL) {

			printk(KERN_ERR "acornfb: unable to allocate screen "

			       "memory\n");

			printk(KERN_ERR "acornfb: unable to allocate screen memory\n");

			return -ENOMEM;

		}
@@ -1103,8 +1102,7 @@ static int acornfb_probe(struct platform_device *dev) 
	v_sync = h_sync / (fb_info.var.yres + fb_info.var.upper_margin +

		 fb_info.var.lower_margin + fb_info.var.vsync_len);



	printk(KERN_INFO "Acornfb: %dkB %cRAM, %s, using %dx%d, "

		"%d.%03dkHz, %dHz\n",

	printk(KERN_INFO "Acornfb: %dkB %cRAM, %s, using %dx%d, %d.%03dkHz, %dHz\n",

		fb_info.fix.smem_len / 1024,

		current_par.using_vram ? 'V' : 'D',

		VIDC_NAME, fb_info.var.xres, fb_info.var.yres,

CRA Git | Maintained and supported by SUSTech CRA and CCSE