fbdev: allow passing more than one aperture for handoff
It removes a hack from nouveau code which had to detect which region to pass to kick vesafb/efifb. Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com> Cc: Eric Anholt <eric@anholt.net> Cc: Ben Skeggs <bskeggs@redhat.com> Cc: Thomas Hellstrom <thellstrom@vmware.com> Cc: Dave Airlie <airlied@redhat.com> Cc: Peter Jones <pjones@redhat.com> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:

committed by
Dave Airlie

parent
3da1f33e79
commit
1471ca9aa7
@@ -177,7 +177,7 @@ static void vesafb_destroy(struct fb_info *info)
|
||||
{
|
||||
if (info->screen_base)
|
||||
iounmap(info->screen_base);
|
||||
release_mem_region(info->aperture_base, info->aperture_size);
|
||||
release_mem_region(info->apertures->ranges[0].base, info->apertures->ranges[0].size);
|
||||
framebuffer_release(info);
|
||||
}
|
||||
|
||||
@@ -295,8 +295,13 @@ static int __init vesafb_probe(struct platform_device *dev)
|
||||
info->par = NULL;
|
||||
|
||||
/* set vesafb aperture size for generic probing */
|
||||
info->aperture_base = screen_info.lfb_base;
|
||||
info->aperture_size = size_total;
|
||||
info->apertures = alloc_apertures(1);
|
||||
if (!info->apertures) {
|
||||
err = -ENOMEM;
|
||||
goto err;
|
||||
}
|
||||
info->apertures->ranges[0].base = screen_info.lfb_base;
|
||||
info->apertures->ranges[0].size = size_total;
|
||||
|
||||
info->screen_base = ioremap(vesafb_fix.smem_start, vesafb_fix.smem_len);
|
||||
if (!info->screen_base) {
|
||||
|
Reference in New Issue
Block a user