lkml.org 
[lkml]   [2010]   [Mar]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[024/116] efifb: fix framebuffer handoff
    2.6.32-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Marcin Slusarz <marcin.slusarz@gmail.com>

    commit 89f3f2199084a160a3a45fa6d9af235696321758 upstream.

    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>
    Cc: maximilian attems <max@stro.at>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/video/efifb.c | 11 ++++++++++-
    1 file changed, 10 insertions(+), 1 deletion(-)

    --- a/drivers/video/efifb.c
    +++ b/drivers/video/efifb.c
    @@ -161,8 +161,17 @@ static int efifb_setcolreg(unsigned regn
    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 pla
    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) {



    \
     
     \ /
      Last update: 2010-03-31 02:19    [W:2.189 / U:0.264 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site