Commit 2a8cbf2a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fbdev-v5.0-rc3' of git://github.com/bzolnier/linux 

Pull fbdev fixes from Bartlomiej Zolnierkiewicz:

 - fix stack memory leak in omap2fb driver (Vlad Tsyrklevich)

 - fix OF node name handling v4.20 regression in offb driver (Rob
   Herring)

 - convert CONFIG_FB_LOGO_CENTER config option added in v5.0-rc1 into a
   kernel parameter (Peter Rosin)

* tag 'fbdev-v5.0-rc3' of git://github.com/bzolnier/linux:
  fbdev: fbmem: convert CONFIG_FB_LOGO_CENTER into a cmd line option
  fbdev: offb: Fix OF node name handling
  omap2fb: Fix stack memory disclosure
parents c3653ebd 890d14d2

Documentation/fb/fbcon.txt

+8 −0
Original line number Diff line number Diff line
@@ -163,6 +163,14 @@ C. Boot options 
	be preserved until there actually is some text is output to the console.

	This option causes fbcon to bind immediately to the fbdev device.



7. fbcon=logo-pos:<location>



	The only possible 'location' is 'center' (without quotes), and when

	given, the bootup logo is moved from the default top-left corner

	location to the center of the framebuffer. If more than one logo is

	displayed due to multiple CPUs, the collected line of logos is moved

	as a whole.



C. Attaching, Detaching and Unloading



Before going on to how to attach, detach and unload the framebuffer console, an

drivers/video/fbdev/core/fbcon.c

+7 −0
Original line number Diff line number Diff line
@@ -510,6 +510,13 @@ static int __init fb_console_setup(char *this_opt) 
			continue;

		}

#endif



		if (!strncmp(options, "logo-pos:", 9)) {

			options += 9;

			if (!strcmp(options, "center"))

				fb_center_logo = true;

			continue;

		}

	}

	return 1;

}

drivers/video/fbdev/core/fbmem.c

+10 −9
Original line number Diff line number Diff line
@@ -53,6 +53,9 @@ EXPORT_SYMBOL(registered_fb); 
int num_registered_fb __read_mostly;

EXPORT_SYMBOL(num_registered_fb);



bool fb_center_logo __read_mostly;

EXPORT_SYMBOL(fb_center_logo);



static struct fb_info *get_fb_info(unsigned int idx)

{

	struct fb_info *fb_info;
@@ -506,8 +509,7 @@ static int fb_show_logo_line(struct fb_info *info, int rotate, 
		fb_set_logo(info, logo, logo_new, fb_logo.depth);

	}



#ifdef CONFIG_FB_LOGO_CENTER

	{

	if (fb_center_logo) {

		int xres = info->var.xres;

		int yres = info->var.yres;
@@ -520,11 +522,11 @@ static int fb_show_logo_line(struct fb_info *info, int rotate, 
			--n;

		image.dx = (xres - n * (logo->width + 8) - 8) / 2;

		image.dy = y ?: (yres - logo->height) / 2;

	}

#else

	} else {

		image.dx = 0;

		image.dy = y;

#endif

	}



	image.width = logo->width;

	image.height = logo->height;
@@ -684,9 +686,8 @@ int fb_prepare_logo(struct fb_info *info, int rotate) 
 	}



	height = fb_logo.logo->height;

#ifdef CONFIG_FB_LOGO_CENTER

	if (fb_center_logo)

		height += (yres - fb_logo.logo->height) / 2;

#endif



	return fb_prepare_extra_logos(info, height, yres);

}

drivers/video/fbdev/offb.c

+9 −9
Original line number Diff line number Diff line
@@ -318,28 +318,28 @@ static void __iomem *offb_map_reg(struct device_node *np, int index, 
}



static void offb_init_palette_hacks(struct fb_info *info, struct device_node *dp,

				    const char *name, unsigned long address)

				    unsigned long address)

{

	struct offb_par *par = (struct offb_par *) info->par;



	if (dp && !strncmp(name, "ATY,Rage128", 11)) {

	if (of_node_name_prefix(dp, "ATY,Rage128")) {

		par->cmap_adr = offb_map_reg(dp, 2, 0, 0x1fff);

		if (par->cmap_adr)

			par->cmap_type = cmap_r128;

	} else if (dp && (!strncmp(name, "ATY,RageM3pA", 12)

			  || !strncmp(name, "ATY,RageM3p12A", 14))) {

	} else if (of_node_name_prefix(dp, "ATY,RageM3pA") ||

		   of_node_name_prefix(dp, "ATY,RageM3p12A")) {

		par->cmap_adr = offb_map_reg(dp, 2, 0, 0x1fff);

		if (par->cmap_adr)

			par->cmap_type = cmap_M3A;

	} else if (dp && !strncmp(name, "ATY,RageM3pB", 12)) {

	} else if (of_node_name_prefix(dp, "ATY,RageM3pB")) {

		par->cmap_adr = offb_map_reg(dp, 2, 0, 0x1fff);

		if (par->cmap_adr)

			par->cmap_type = cmap_M3B;

	} else if (dp && !strncmp(name, "ATY,Rage6", 9)) {

	} else if (of_node_name_prefix(dp, "ATY,Rage6")) {

		par->cmap_adr = offb_map_reg(dp, 1, 0, 0x1fff);

		if (par->cmap_adr)

			par->cmap_type = cmap_radeon;

	} else if (!strncmp(name, "ATY,", 4)) {

	} else if (of_node_name_prefix(dp, "ATY,")) {

		unsigned long base = address & 0xff000000UL;

		par->cmap_adr =

			ioremap(base + 0x7ff000, 0x1000) + 0xcc0;
@@ -350,7 +350,7 @@ static void offb_init_palette_hacks(struct fb_info *info, struct device_node *dp 
		par->cmap_adr = offb_map_reg(dp, 0, 0x6000, 0x1000);

		if (par->cmap_adr)

			par->cmap_type = cmap_gxt2000;

	} else if (dp && !strncmp(name, "vga,Display-", 12)) {

	} else if (of_node_name_prefix(dp, "vga,Display-")) {

		/* Look for AVIVO initialized by SLOF */

		struct device_node *pciparent = of_get_parent(dp);

		const u32 *vid, *did;
@@ -438,7 +438,7 @@ static void __init offb_init_fb(const char *name, 


	par->cmap_type = cmap_unknown;

	if (depth == 8)

		offb_init_palette_hacks(info, dp, name, address);

		offb_init_palette_hacks(info, dp, address);

	else

		fix->visual = FB_VISUAL_TRUECOLOR;

drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c

+2 −0
Original line number Diff line number Diff line
@@ -609,6 +609,8 @@ int omapfb_ioctl(struct fb_info *fbi, unsigned int cmd, unsigned long arg) 


	int r = 0;



	memset(&p, 0, sizeof(p));



	switch (cmd) {

	case OMAPFB_SYNC_GFX:

		DBG("ioctl SYNC_GFX\n");