Commit b788769e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fbdev-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux 

Pull fbdev changes from Tomi Valkeinen:
 "This is a rather boring pull request.  There is one new fb driver,
  OpenCores VGA/LCD, but other than that it's just minor cleanups and
  fixes"

* tag 'fbdev-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (51 commits)
  i810: delete useless variable
  video: add OpenCores VGA/LCD framebuffer driver
  video/logo: Remove MIPS-specific include section
  tgafb: potential NULL dereference in init
  video: mmp: Using plain integer as NULL pointer
  video: mmp: delete a stray mutex_unlock()
  video: amba-clcd: Make CLCD driver available on more platforms
  video: Replace local macro with PCI standard macro
  fbmem: really support wildcard video=options for all fbdev drivers
  video: vgacon: Don't build on arm64
  video: mx3fb: Allow blocking during framebuffer allocation
  fbcon: Fix memory leak in fbcon_exit().
  fbcon: trivial optimization for fbcon_exit
  video: pxa168fb: Cleanup pxa168fb.h file
  video: pxa: Cleanup video-pxafb.h header
  video: msm: Cleanup video-msm_fb.h header
  video: ep93xx: Cleanup video-ep93xx.h header
  video: mxsfb: fix broken videomode selection
  video: mxsfb: convert pr_debug()/dev_dbg() to pr_err()/dev_err() for error messages
  video: vmlfb: remove unnecessary pci_set_drvdata()
  ...
parents 91466574 cb1fbad7

drivers/video/Kconfig

+18 −1
Original line number Diff line number Diff line
@@ -312,7 +312,8 @@ config FB_PM2_FIFO_DISCONNECT 


config FB_ARMCLCD

	tristate "ARM PrimeCell PL110 support"

	depends on FB && ARM && ARM_AMBA

	depends on ARM || ARM64 || COMPILE_TEST

	depends on FB && ARM_AMBA

	select FB_CFB_FILLRECT

	select FB_CFB_COPYAREA

	select FB_CFB_IMAGEBLIT
@@ -979,6 +980,22 @@ config FB_PVR2 
	  (<file:drivers/video/pvr2fb.c>). Please see the file

	  <file:Documentation/fb/pvr2fb.txt>.



config FB_OPENCORES

	tristate "OpenCores VGA/LCD core 2.0 framebuffer support"

	depends on FB

	select FB_CFB_FILLRECT

	select FB_CFB_COPYAREA

	select FB_CFB_IMAGEBLIT

	help

	  This enables support for the OpenCores VGA/LCD core.



	  The OpenCores VGA/LCD core is typically used together with

	  softcore CPUs (e.g. OpenRISC or Microblaze) or hard processor

	  systems (e.g. Altera socfpga or Xilinx Zynq) on FPGAs.



	  The source code and specification for the core is available at

	  <http://opencores.org/project,vga_lcd>



config FB_S1D13XXX

	tristate "Epson S1D13XXX framebuffer support"

	depends on FB

drivers/video/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ obj-$(CONFIG_FB_NUC900) += nuc900fb.o 
obj-$(CONFIG_FB_JZ4740)		  += jz4740_fb.o

obj-$(CONFIG_FB_PUV3_UNIGFX)      += fb-puv3.o

obj-$(CONFIG_FB_HYPERV)		  += hyperv_fb.o

obj-$(CONFIG_FB_OPENCORES)	  += ocfb.o



# Platform or fallback drivers go here

obj-$(CONFIG_FB_UVESA)            += uvesafb.o

drivers/video/asiliantfb.c

+0 −1
Original line number Diff line number Diff line
@@ -589,7 +589,6 @@ static void asiliantfb_remove(struct pci_dev *dp) 
	fb_dealloc_cmap(&p->cmap);

	iounmap(p->screen_base);

	release_mem_region(pci_resource_start(dp, 0), pci_resource_len(dp, 0));

	pci_set_drvdata(dp, NULL);

	framebuffer_release(p);

}

drivers/video/console/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ config VGA_CONSOLE 
	bool "VGA text console" if EXPERT || !X86

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

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

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

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

		!ARM64

	default y

	help

	  Saying Y here will allow you to use Linux in text mode through a

drivers/video/console/fbcon.c

+4 −1
Original line number Diff line number Diff line
@@ -3547,8 +3547,10 @@ static void fbcon_exit(void) 
			"no"));



		for (j = first_fb_vc; j <= last_fb_vc; j++) {

			if (con2fb_map[j] == i)

			if (con2fb_map[j] == i) {

				mapped = 1;

				break;

			}

		}



		if (mapped) {
@@ -3561,6 +3563,7 @@ static void fbcon_exit(void) 


				fbcon_del_cursor_timer(info);

				kfree(ops->cursor_src);

				kfree(ops->cursor_state.mask);

				kfree(info->fbcon_par);

				info->fbcon_par = NULL;

			}

CRA Git | Maintained and supported by SUSTech CRA and CCSE