summaryrefslogtreecommitdiffstats
path: root/drivers/video/simplefb.c
diff options
context:
space:
mode:
authorDavid Herrmann <dh.herrmann@gmail.com>2013-08-02 14:05:21 +0200
committerH. Peter Anvin <hpa@linux.intel.com>2013-08-02 16:17:45 -0700
commitdf0960ab2d95543a7c162b04b2064991666adbad (patch)
tree894f04331ed7d55fa91b9a1145b9808c3fba9798 /drivers/video/simplefb.c
parent5ef76da644bf346d29200007d8d3779e7009dabb (diff)
downloadop-kernel-dev-df0960ab2d95543a7c162b04b2064991666adbad.zip
op-kernel-dev-df0960ab2d95543a7c162b04b2064991666adbad.tar.gz
fbdev: simplefb: mark as fw and allocate apertures
fbdev-core uses FBINFO_MISC_FIRMWARE to mark drivers that use firmware framebuffers. Furthermore, we now allocate apertures for the fbinfo device. Both information is used by remove_conflicting_framebuffers() to remove a fbdev device whenever a real driver is loaded. This is used heavily on x86 for VGA/vesa/EFI framebuffers, but is also of great use for all other systems. Especially with x86 support for simplefb, this information is needed to unload simplefb before a real hw-driver (like i915, radeon, nouveau) is loaded. Signed-off-by: David Herrmann <dh.herrmann@gmail.com> Link: http://lkml.kernel.org/r/1375445127-15480-3-git-send-email-dh.herrmann@gmail.com Tested-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'drivers/video/simplefb.c')
-rw-r--r--drivers/video/simplefb.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/video/simplefb.c b/drivers/video/simplefb.c
index 5886989..8d78106 100644
--- a/drivers/video/simplefb.c
+++ b/drivers/video/simplefb.c
@@ -202,8 +202,16 @@ static int simplefb_probe(struct platform_device *pdev)
info->var.blue = params.format->blue;
info->var.transp = params.format->transp;
+ info->apertures = alloc_apertures(1);
+ if (!info->apertures) {
+ framebuffer_release(info);
+ return -ENOMEM;
+ }
+ info->apertures->ranges[0].base = info->fix.smem_start;
+ info->apertures->ranges[0].size = info->fix.smem_len;
+
info->fbops = &simplefb_ops;
- info->flags = FBINFO_DEFAULT;
+ info->flags = FBINFO_DEFAULT | FBINFO_MISC_FIRMWARE;
info->screen_base = devm_ioremap(&pdev->dev, info->fix.smem_start,
info->fix.smem_len);
if (!info->screen_base) {
OpenPOWER on IntegriCloud