Commit 410b4297 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull fbdev updates from Tomi Valkeinen:

 - imxfb: fix lcd power up

 - small fixes and cleanups

* tag 'fbdev-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
  fbdev: Use IS_ENABLED() instead of checking for built-in or module
  efifb: Don't show the mapping VA
  video: AMBA CLCD: Remove unncessary include in amba-clcd.c
  fbdev: ssd1307fb: Fix charge pump setting
  Documentation: fb: fix spelling mistakes
  fbdev: fbmem: implement error handling in fbmem_init()
  fbdev: sh_mipi_dsi: remove driver
  video: fbdev: imxfb: add some error handling
  video: fbdev: imxfb: fix semantic of .get_power and .set_power
  video: fbdev: omap2: Remove deprecated regulator_can_change_voltage() usage
parents e4fba88d ab366b40

Documentation/fb/udlfb.txt

+3 −3
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ pairing that with a hardware framebuffer (16MB) on the other end of the 
USB wire.  That hardware framebuffer is able to drive the VGA, DVI, or HDMI

monitor with no CPU involvement until a pixel has to change.



The CPU or other local resource does all the rendering; optinally compares the

The CPU or other local resource does all the rendering; optionally compares the

result with a local shadow of the remote hardware framebuffer to identify

the minimal set of pixels that have changed; and compresses and sends those

pixels line-by-line via USB bulk transfers.
@@ -66,10 +66,10 @@ means that from a hardware and fbdev software perspective, everything is good. 
At that point, a /dev/fb? interface will be present for user-mode applications

to open and begin writing to the framebuffer of the DisplayLink device using

standard fbdev calls.  Note that if mmap() is used, by default the user mode

application must send down damage notifcations to trigger repaints of the

application must send down damage notifications to trigger repaints of the

changed regions.  Alternatively, udlfb can be recompiled with experimental

defio support enabled, to support a page-fault based detection mechanism

that can work without explicit notifcation.

that can work without explicit notification.



The most common client of udlfb is xf86-video-displaylink or a modified

xf86-video-fbdev X server. These servers have no real DisplayLink specific

drivers/video/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -8,10 +8,6 @@ menu "Graphics support" 
config HAVE_FB_ATMEL

	bool



config SH_MIPI_DSI

	tristate

	depends on (SUPERH || ARCH_SHMOBILE) && HAVE_CLK



config SH_LCD_MIPI_DSI

	bool

drivers/video/fbdev/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -1993,7 +1993,6 @@ config FB_SH_MOBILE_LCDC 
	select FB_SYS_FOPS

	select FB_DEFERRED_IO

	select FB_BACKLIGHT

	select SH_MIPI_DSI if SH_LCD_MIPI_DSI

	---help---

	  Frame buffer driver for the on-chip SH-Mobile LCD controller.

drivers/video/fbdev/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -117,7 +117,6 @@ obj-$(CONFIG_FB_SM501) += sm501fb.o 
obj-$(CONFIG_FB_UDL)		  += udlfb.o

obj-$(CONFIG_FB_SMSCUFX)	  += smscufx.o

obj-$(CONFIG_FB_XILINX)           += xilinxfb.o

obj-$(CONFIG_SH_MIPI_DSI)	  += sh_mipi_dsi.o

obj-$(CONFIG_FB_SH_MOBILE_MERAM)  += sh_mobile_meram.o

obj-$(CONFIG_FB_SH_MOBILE_LCDC)	  += sh_mobile_lcdcfb.o

obj-$(CONFIG_FB_OMAP)             += omap/

drivers/video/fbdev/amba-clcd.c

+0 −2
Original line number Diff line number Diff line
@@ -34,8 +34,6 @@ 
#include <video/of_display_timing.h>

#include <video/videomode.h>



#include <asm/sizes.h>



#define to_clcd(info)	container_of(info, struct clcd_fb, fb)



/* This is limited to 16 characters when displayed by X startup */

CRA Git | Maintained and supported by SUSTech CRA and CCSE