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

Commit 7eb97ba6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fbdev-v4.13-rc5' of git://github.com/bzolnier/linux 

Pull fbdev fixes from Bartlomiej Zolnierkiewicz:

 - allow user to disable write combined mapping in efifb driver (Dave
   Airlie)

 - fix use after free bugs on driver removal in imxfb driver (Dan
   Carpenter)

 - fix unused variable warning in omapfb driver (Arnd Bergmann)

* tag 'fbdev-v4.13-rc5' of git://github.com/bzolnier/linux:
  efifb: allow user to disable write combined mapping.
  fbdev: omapfb: remove unused variable
  video: fbdev: imxfb: use after free in imxfb_remove()
parents 2bfc37cd dd0c41f8

Documentation/fb/efifb.txt

+6 −0
Original line number Diff line number Diff line
@@ -27,5 +27,11 @@ You have to add the following kernel parameters in your elilo.conf: 
	Macbook Pro 17", iMac 20" :

		video=efifb:i20



Accepted options:



nowc	Don't map the framebuffer write combined. This can be used

	to workaround side-effects and slowdowns on other CPU cores

	when large amounts of console data are written.



--

Edgar Hucek <gimli@dark-green.com>

drivers/video/fbdev/efifb.c

+7 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <asm/efi.h>



static bool request_mem_succeeded = false;

static bool nowc = false;



static struct fb_var_screeninfo efifb_defined = {

	.activate		= FB_ACTIVATE_NOW,
@@ -99,6 +100,8 @@ static int efifb_setup(char *options) 
				screen_info.lfb_height = simple_strtoul(this_opt+7, NULL, 0);

			else if (!strncmp(this_opt, "width:", 6))

				screen_info.lfb_width = simple_strtoul(this_opt+6, NULL, 0);

			else if (!strcmp(this_opt, "nowc"))

				nowc = true;

		}

	}
@@ -255,6 +258,9 @@ static int efifb_probe(struct platform_device *dev) 
	info->apertures->ranges[0].base = efifb_fix.smem_start;

	info->apertures->ranges[0].size = size_remap;



	if (nowc)

		info->screen_base = ioremap(efifb_fix.smem_start, efifb_fix.smem_len);

	else

		info->screen_base = ioremap_wc(efifb_fix.smem_start, efifb_fix.smem_len);

	if (!info->screen_base) {

		pr_err("efifb: abort, cannot ioremap video memory 0x%x @ 0x%lx\n",

drivers/video/fbdev/imxfb.c

+3 −7
Original line number Diff line number Diff line
@@ -1073,20 +1073,16 @@ static int imxfb_remove(struct platform_device *pdev) 
	imxfb_disable_controller(fbi);



	unregister_framebuffer(info);



	fb_dealloc_cmap(&info->cmap);

	pdata = dev_get_platdata(&pdev->dev);

	if (pdata && pdata->exit)

		pdata->exit(fbi->pdev);



	fb_dealloc_cmap(&info->cmap);

	kfree(info->pseudo_palette);

	framebuffer_release(info);



	dma_free_wc(&pdev->dev, fbi->map_size, info->screen_base,

		    fbi->map_dma);



	iounmap(fbi->regs);

	release_mem_region(res->start, resource_size(res));

	kfree(info->pseudo_palette);

	framebuffer_release(info);



	return 0;

}

drivers/video/fbdev/omap2/omapfb/dss/core.c

+0 −1
Original line number Diff line number Diff line
@@ -193,7 +193,6 @@ static struct notifier_block omap_dss_pm_notif_block = { 


static int __init omap_dss_probe(struct platform_device *pdev)

{

	struct omap_dss_board_info *pdata = pdev->dev.platform_data;

	int r;



	core.pdev = pdev;