tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

efifb: fix framebuffer handoff

Commit 4410f3910947dcea8672280b3adecd53cec4e85e ("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>

authored by

Marcin Slusarz and committed by
Linus Torvalds 89f3f219 115079aa

+10 -1
+10 -1
drivers/video/efifb.c
··· 161 161 return 0; 162 162 } 163 163 164 + static void efifb_destroy(struct fb_info *info) 165 + { 166 + if (info->screen_base) 167 + iounmap(info->screen_base); 168 + release_mem_region(info->aperture_base, info->aperture_size); 169 + framebuffer_release(info); 170 + } 171 + 164 172 static struct fb_ops efifb_ops = { 165 173 .owner = THIS_MODULE, 174 + .fb_destroy = efifb_destroy, 166 175 .fb_setcolreg = efifb_setcolreg, 167 176 .fb_fillrect = cfb_fillrect, 168 177 .fb_copyarea = cfb_copyarea, ··· 290 281 info->par = NULL; 291 282 292 283 info->aperture_base = efifb_fix.smem_start; 293 - info->aperture_size = size_total; 284 + info->aperture_size = size_remap; 294 285 295 286 info->screen_base = ioremap(efifb_fix.smem_start, efifb_fix.smem_len); 296 287 if (!info->screen_base) {