On 02/13/2010 05:41 AM, Marcin Slusarz wrote: > 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. > > See: http://bugzilla.kernel.org/show_bug.cgi?id=15151 > > Reported-by: Alex Zhavnerchik <alex.vizor@xxxxxxxxx> > Tested-by: Alex Zhavnerchik <alex.vizor@xxxxxxxxx> > Cc: Peter Jones <pjones@xxxxxxxxxx> > Cc: Huang Ying <ying.huang@xxxxxxxxx> > Cc: Dave Airlie <airlied@xxxxxxxxxx> > Cc: linux-fbdev@xxxxxxxxxxxxxxx > Signed-off-by: Marcin Slusarz <marcin.slusarz@xxxxxxxxx> Looks good. Acked by: Peter Jones <pjones@xxxxxxxxxx> > --- > drivers/video/efifb.c | 11 ++++++++++- > 1 files changed, 10 insertions(+), 1 deletions(-) > > diff --git a/drivers/video/efifb.c b/drivers/video/efifb.c > index eb12182..d25df51 100644 > --- a/drivers/video/efifb.c > +++ b/drivers/video/efifb.c > @@ -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) { -- Peter Computer games don't affect kids; I mean if Pac-Man affected us as kids, we'd all be running around in darkened rooms, munching magic pills and listening to repetitive electronic music. -- Not actually Kristian Wilson, Nintendo, Inc, 1989 -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
