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

Commit 0a582821 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull fbdev updates from Tomi Valkeinen:
 - new 6x10 font
 - various small fixes and cleanups

* tag 'fbdev-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (30 commits)
  fonts: Add 6x10 font
  videomode: provide dummy inline functions for !CONFIG_OF
  video/atmel_lcdfb: Introduce regulator support
  fbdev: sh_mobile_hdmi: Re-init regs before irq re-enable on resume
  framebuffer: fix screen corruption when copying
  framebuffer: fix border color
  arm, fbdev, omap2, LLVMLinux: Remove nested function from omapfb
  arm, fbdev, omap2, LLVMLinux: Remove nested function from omap2 dss
  video: fbdev: valkyriefb.c: use container_of to resolve fb_info_valkyrie from fb_info
  video: fbdev: pxafb.c: use container_of to resolve pxafb_info/layer from fb_info
  video: fbdev: cyber2000fb.c: use container_of to resolve cfb_info from fb_info
  video: fbdev: controlfb.c: use container_of to resolve fb_info_control from fb_info
  video: fbdev: sa1100fb.c: use container_of to resolve sa1100fb_info from fb_info
  video: fbdev: stifb.c: use container_of to resolve stifb_info from fb_info
  video: fbdev: sis: sis_main.c: Cleaning up missing null-terminate in conjunction with strncpy
  video: valkyriefb: Fix unused variable warning in set_valkyrie_clock()
  video: fbdev: use %*ph specifier to dump small buffers
  video: mx3fb: always enable BACKLIGHT_LCD_SUPPORT
  video: fbdev: au1200fb: delete double assignment
  video: fbdev: sis: delete double assignment
  ...
parents 8a5de182 33ac9dba

Documentation/devicetree/bindings/video/atmel,lcdc.txt

+3 −0
Original line number Diff line number Diff line
@@ -20,6 +20,9 @@ Required nodes: 
- default-mode: a videomode within the display with timing parameters

	as specified below.



Optional properties:

- lcd-supply: Regulator for LCD supply voltage.



Example:



	fb0: fb@0x00500000 {

drivers/video/console/bitblit.c

+1 −2
Original line number Diff line number Diff line
@@ -205,7 +205,6 @@ static void bit_putcs(struct vc_data *vc, struct fb_info *info, 
static void bit_clear_margins(struct vc_data *vc, struct fb_info *info,

			      int bottom_only)

{

	int bgshift = (vc->vc_hi_font_mask) ? 13 : 12;

	unsigned int cw = vc->vc_font.width;

	unsigned int ch = vc->vc_font.height;

	unsigned int rw = info->var.xres - (vc->vc_cols*cw);
@@ -214,7 +213,7 @@ static void bit_clear_margins(struct vc_data *vc, struct fb_info *info, 
	unsigned int bs = info->var.yres - bh;

	struct fb_fillrect region;



	region.color = attr_bgcol_ec(bgshift, vc, info);

	region.color = 0;

	region.rop = ROP_COPY;



	if (rw && !bottom_only) {

drivers/video/console/fbcon_ccw.c

+1 −2
Original line number Diff line number Diff line
@@ -197,9 +197,8 @@ static void ccw_clear_margins(struct vc_data *vc, struct fb_info *info, 
	unsigned int bh = info->var.xres - (vc->vc_rows*ch);

	unsigned int bs = vc->vc_rows*ch;

	struct fb_fillrect region;

	int bgshift = (vc->vc_hi_font_mask) ? 13 : 12;



	region.color = attr_bgcol_ec(bgshift,vc,info);

	region.color = 0;

	region.rop = ROP_COPY;



	if (rw && !bottom_only) {

drivers/video/console/fbcon_cw.c

+1 −2
Original line number Diff line number Diff line
@@ -180,9 +180,8 @@ static void cw_clear_margins(struct vc_data *vc, struct fb_info *info, 
	unsigned int bh = info->var.xres - (vc->vc_rows*ch);

	unsigned int rs = info->var.yres - rw;

	struct fb_fillrect region;

	int bgshift = (vc->vc_hi_font_mask) ? 13 : 12;



	region.color = attr_bgcol_ec(bgshift,vc,info);

	region.color = 0;

	region.rop = ROP_COPY;



	if (rw && !bottom_only) {

drivers/video/console/fbcon_ud.c

+1 −2
Original line number Diff line number Diff line
@@ -227,9 +227,8 @@ static void ud_clear_margins(struct vc_data *vc, struct fb_info *info, 
	unsigned int rw = info->var.xres - (vc->vc_cols*cw);

	unsigned int bh = info->var.yres - (vc->vc_rows*ch);

	struct fb_fillrect region;

	int bgshift = (vc->vc_hi_font_mask) ? 13 : 12;



	region.color = attr_bgcol_ec(bgshift,vc,info);

	region.color = 0;

	region.rop = ROP_COPY;



	if (rw && !bottom_only) {