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

Commit 3a2f22b7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull fbdev fixes from Tomi Valkeinen:

 - fix fb console option parsing

 - fixes for OMAPDSS/OMAPFB crashes related to module unloading and
   device/driver binding & unbinding.

 - fix for OMAP HDMI PLL locking failing in certain cases

 - misc minor fixes for atmel lcdfb and OMAP

* tag 'fbdev-fixes-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
  omap: dss: connector-analog-tv: Add missing module device table
  OMAPDSS: DSI: Fix PLL_SELFEQDCO field width
  OMAPDSS: fix dispc register dump for preload & mflag
  OMAPDSS: DISPC: fix mflag offset
  OMAPDSS: HDMI: fix regsd write
  OMAPDSS: HDMI: fix PLL GO bit handling
  OMAPFB: fix releasing overlays
  OMAPFB: fix overlay disable when freeing resources.
  OMAPDSS: apply: wait pending updates on manager disable
  OMAPFB: remove __exit annotation
  OMAPDSS: set suppress_bind_attrs
  OMAPFB: add missing MODULE_ALIAS()
  drivers: video: fbdev: atmel_lcdfb.c: remove unnecessary header
  video/console: Resolve several shadow warnings
  fbcon: Fix option parsing control flow in fb_console_setup
parents 94712927 a942535d

drivers/video/console/fbcon.c

+9 −10
Original line number Diff line number Diff line
@@ -448,8 +448,10 @@ static int __init fb_console_setup(char *this_opt) 
		return 1;



	while ((options = strsep(&this_opt, ",")) != NULL) {

		if (!strncmp(options, "font:", 5))

		if (!strncmp(options, "font:", 5)) {

			strlcpy(fontname, options + 5, sizeof(fontname));

			continue;

		}

		

		if (!strncmp(options, "scrollback:", 11)) {

			options += 11;
@@ -457,13 +459,9 @@ static int __init fb_console_setup(char *this_opt) 
				fbcon_softback_size = simple_strtoul(options, &options, 0);

				if (*options == 'k' || *options == 'K') {

					fbcon_softback_size *= 1024;

					options++;

				}

				if (*options != ',')

					return 1;

				options++;

			} else

				return 1;

			}

			continue;

		}

		

		if (!strncmp(options, "map:", 4)) {
@@ -478,8 +476,7 @@ static int __init fb_console_setup(char *this_opt) 


				fbcon_map_override();

			}



			return 1;

			continue;

		}



		if (!strncmp(options, "vc:", 3)) {
@@ -491,6 +488,7 @@ static int __init fb_console_setup(char *this_opt) 
			if (*options++ == '-')

				last_fb_vc = simple_strtoul(options, &options, 10) - 1;

			fbcon_is_default = 0; 

			continue;

		}



		if (!strncmp(options, "rotate:", 7)) {
@@ -499,6 +497,7 @@ static int __init fb_console_setup(char *this_opt) 
				initial_rotation = simple_strtoul(options, &options, 0);

			if (initial_rotation > 3)

				initial_rotation = 0;

			continue;

		}

	}

	return 1;

drivers/video/console/vgacon.c

+12 −12
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static int cursor_size_lastfrom; 
static int cursor_size_lastto;

static u32 vgacon_xres;

static u32 vgacon_yres;

static struct vgastate state;

static struct vgastate vgastate;



#define BLANK 0x0020
@@ -400,7 +400,7 @@ static const char *vgacon_startup(void) 


	vga_video_num_lines = screen_info.orig_video_lines;

	vga_video_num_columns = screen_info.orig_video_cols;

	state.vgabase = NULL;

	vgastate.vgabase = NULL;



	if (screen_info.orig_video_mode == 7) {

		/* Monochrome display */
@@ -851,12 +851,12 @@ static void vga_set_palette(struct vc_data *vc, unsigned char *table) 
{

	int i, j;



	vga_w(state.vgabase, VGA_PEL_MSK, 0xff);

	vga_w(vgastate.vgabase, VGA_PEL_MSK, 0xff);

	for (i = j = 0; i < 16; i++) {

		vga_w(state.vgabase, VGA_PEL_IW, table[i]);

		vga_w(state.vgabase, VGA_PEL_D, vc->vc_palette[j++] >> 2);

		vga_w(state.vgabase, VGA_PEL_D, vc->vc_palette[j++] >> 2);

		vga_w(state.vgabase, VGA_PEL_D, vc->vc_palette[j++] >> 2);

		vga_w(vgastate.vgabase, VGA_PEL_IW, table[i]);

		vga_w(vgastate.vgabase, VGA_PEL_D, vc->vc_palette[j++] >> 2);

		vga_w(vgastate.vgabase, VGA_PEL_D, vc->vc_palette[j++] >> 2);

		vga_w(vgastate.vgabase, VGA_PEL_D, vc->vc_palette[j++] >> 2);

	}

}
@@ -1008,7 +1008,7 @@ static int vgacon_blank(struct vc_data *c, int blank, int mode_switch) 
	switch (blank) {

	case 0:		/* Unblank */

		if (vga_vesa_blanked) {

			vga_vesa_unblank(&state);

			vga_vesa_unblank(&vgastate);

			vga_vesa_blanked = 0;

		}

		if (vga_palette_blanked) {
@@ -1022,7 +1022,7 @@ static int vgacon_blank(struct vc_data *c, int blank, int mode_switch) 
	case 1:		/* Normal blanking */

	case -1:	/* Obsolete */

		if (!mode_switch && vga_video_type == VIDEO_TYPE_VGAC) {

			vga_pal_blank(&state);

			vga_pal_blank(&vgastate);

			vga_palette_blanked = 1;

			return 0;

		}
@@ -1034,7 +1034,7 @@ static int vgacon_blank(struct vc_data *c, int blank, int mode_switch) 
		return 1;

	default:		/* VESA blanking */

		if (vga_video_type == VIDEO_TYPE_VGAC) {

			vga_vesa_blank(&state, blank - 1);

			vga_vesa_blank(&vgastate, blank - 1);

			vga_vesa_blanked = blank;

		}

		return 0;
@@ -1280,7 +1280,7 @@ static int vgacon_font_set(struct vc_data *c, struct console_font *font, unsigne 
	    (charcount != 256 && charcount != 512))

		return -EINVAL;



	rc = vgacon_do_font_op(&state, font->data, 1, charcount == 512);

	rc = vgacon_do_font_op(&vgastate, font->data, 1, charcount == 512);

	if (rc)

		return rc;
@@ -1299,7 +1299,7 @@ static int vgacon_font_get(struct vc_data *c, struct console_font *font) 
	font->charcount = vga_512_chars ? 512 : 256;

	if (!font->data)

		return 0;

	return vgacon_do_font_op(&state, font->data, 0, vga_512_chars);

	return vgacon_do_font_op(&vgastate, font->data, 0, vga_512_chars);

}



#else

drivers/video/fbdev/atmel_lcdfb.c

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include <linux/regulator/consumer.h>

#include <video/videomode.h>



#include <mach/cpu.h>

#include <asm/gpio.h>



#include <video/atmel_lcdc.h>

drivers/video/fbdev/omap2/displays-new/connector-analog-tv.c

+3 −0
Original line number Diff line number Diff line
@@ -301,6 +301,8 @@ static const struct of_device_id tvc_of_match[] = { 
	{},

};



MODULE_DEVICE_TABLE(of, tvc_of_match);



static struct platform_driver tvc_connector_driver = {

	.probe	= tvc_probe,

	.remove	= __exit_p(tvc_remove),
@@ -308,6 +310,7 @@ static struct platform_driver tvc_connector_driver = { 
		.name	= "connector-analog-tv",

		.owner	= THIS_MODULE,

		.of_match_table = tvc_of_match,

		.suppress_bind_attrs = true,

	},

};

drivers/video/fbdev/omap2/displays-new/connector-dvi.c

+1 −0
Original line number Diff line number Diff line
@@ -391,6 +391,7 @@ static struct platform_driver dvi_connector_driver = { 
		.name	= "connector-dvi",

		.owner	= THIS_MODULE,

		.of_match_table = dvic_of_match,

		.suppress_bind_attrs = true,

	},

};