diff options
| author | Dave Airlie <airlied@ppcg5.localdomain> | 2009-12-06 20:01:26 +0000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 17:09:29 +1100 |
| commit | ceae8cbe94f3127253110e2d01b9334069e93177 (patch) | |
| tree | 152d0bedbe6a7574db852e90bf5dd0a506180d51 | |
| parent | 88358ab08944da726e948d216977ad499dfc15c6 (diff) | |
| download | op-kernel-dev-ceae8cbe94f3127253110e2d01b9334069e93177.zip op-kernel-dev-ceae8cbe94f3127253110e2d01b9334069e93177.tar.gz | |
offb: Add support for framebuffer handoff to offb.
This allows offb to be used for initial framebuffer,
and a kms driver to take over later in the boot sequence.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
| -rw-r--r-- | drivers/video/offb.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/drivers/video/offb.c b/drivers/video/offb.c index 4d8c54c..b043ac8 100644 --- a/drivers/video/offb.c +++ b/drivers/video/offb.c @@ -282,8 +282,17 @@ static int offb_set_par(struct fb_info *info) return 0; } +static void offb_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 offb_ops = { .owner = THIS_MODULE, + .fb_destroy = offb_destroy, .fb_setcolreg = offb_setcolreg, .fb_set_par = offb_set_par, .fb_blank = offb_blank, @@ -482,10 +491,14 @@ static void __init offb_init_fb(const char *name, const char *full_name, var->sync = 0; var->vmode = FB_VMODE_NONINTERLACED; + /* set offb aperture size for generic probing */ + info->aperture_base = address; + info->aperture_size = fix->smem_len; + info->fbops = &offb_ops; info->screen_base = ioremap(address, fix->smem_len); info->pseudo_palette = (void *) (info + 1); - info->flags = FBINFO_DEFAULT | foreign_endian; + info->flags = FBINFO_DEFAULT | FBINFO_MISC_FIRMWARE | foreign_endian; fb_alloc_cmap(&info->cmap, 256, 0); |
