efifb: fix framebuffer handoff (89f3f219) · Commits · 戴 / test

Commit ("fbdev: add support for handoff from firmware to hw framebuffers") didn't add fb_destroy operation to efifb. Fix it and change aperture_size to match size passed to request_mem_region. Addresses http://bugzilla.kernel.org/show_bug.cgi?id=15151 Signed-off-by:

Marcin Slusarz <marcin.slusarz@gmail.com> Reported-by:

Alex Zhavnerchik <alex.vizor@gmail.com> Tested-by:

Alex Zhavnerchik <alex.vizor@gmail.com> Acked-by:

Peter Jones <pjones@redhat.com> Cc: Huang Ying <ying.huang@intel.com> Cc: Dave Airlie <airlied@redhat.com> Cc: "Rafael J. Wysocki" <rjw@sisk.pl> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

drivers/video/efifb.c

+10 −1

Original line number	Diff line number	Diff line
		@@ -161,8 +161,17 @@ static int efifb_setcolreg(unsigned regno, unsigned red, unsigned green,
		return 0;
		}

		static void efifb_destroy(struct fb_info *info)
		{
		if (info->screen_base)
		iounmap(info->screen_base);
		release_mem_region(info->aperture_base, info->aperture_size);
		framebuffer_release(info);
		}

		static struct fb_ops efifb_ops = {
		.owner = THIS_MODULE,
		.fb_destroy = efifb_destroy,
		.fb_setcolreg = efifb_setcolreg,
		.fb_fillrect = cfb_fillrect,
		.fb_copyarea = cfb_copyarea,
		@@ -281,7 +290,7 @@ static int __init efifb_probe(struct platform_device *dev)
		info->par = NULL;

		info->aperture_base = efifb_fix.smem_start;
		info->aperture_size = size_total;
		info->aperture_size = size_remap;

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

Admin message