diff options
Diffstat (limited to 'drivers/video/simplefb.c')
| -rw-r--r-- | drivers/video/simplefb.c | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/drivers/video/simplefb.c b/drivers/video/simplefb.c index 8d7810613058..210f3a02121a 100644 --- a/drivers/video/simplefb.c +++ b/drivers/video/simplefb.c @@ -66,8 +66,15 @@ static int simplefb_setcolreg(u_int regno, u_int red, u_int green, u_int blue, return 0; } +static void simplefb_destroy(struct fb_info *info) +{ + if (info->screen_base) + iounmap(info->screen_base); +} + static struct fb_ops simplefb_ops = { .owner = THIS_MODULE, + .fb_destroy = simplefb_destroy, .fb_setcolreg = simplefb_setcolreg, .fb_fillrect = cfb_fillrect, .fb_copyarea = cfb_copyarea, @@ -132,7 +139,7 @@ static int simplefb_parse_dt(struct platform_device *pdev, static int simplefb_parse_pd(struct platform_device *pdev, struct simplefb_params *params) { - struct simplefb_platform_data *pd = pdev->dev.platform_data; + struct simplefb_platform_data *pd = dev_get_platdata(&pdev->dev); int i; params->width = pd->width; @@ -167,7 +174,7 @@ static int simplefb_probe(struct platform_device *pdev) return -ENODEV; ret = -ENODEV; - if (pdev->dev.platform_data) + if (dev_get_platdata(&pdev->dev)) ret = simplefb_parse_pd(pdev, ¶ms); else if (pdev->dev.of_node) ret = simplefb_parse_dt(pdev, ¶ms); @@ -212,17 +219,26 @@ static int simplefb_probe(struct platform_device *pdev) info->fbops = &simplefb_ops; info->flags = FBINFO_DEFAULT | FBINFO_MISC_FIRMWARE; - info->screen_base = devm_ioremap(&pdev->dev, info->fix.smem_start, - info->fix.smem_len); + info->screen_base = ioremap_wc(info->fix.smem_start, + info->fix.smem_len); if (!info->screen_base) { framebuffer_release(info); return -ENODEV; } info->pseudo_palette = (void *)(info + 1); + dev_info(&pdev->dev, "framebuffer at 0x%lx, 0x%x bytes, mapped to 0x%p\n", + info->fix.smem_start, info->fix.smem_len, + info->screen_base); + dev_info(&pdev->dev, "format=%s, mode=%dx%dx%d, linelength=%d\n", + params.format->name, + info->var.xres, info->var.yres, + info->var.bits_per_pixel, info->fix.line_length); + ret = register_framebuffer(info); if (ret < 0) { dev_err(&pdev->dev, "Unable to register simplefb: %d\n", ret); + iounmap(info->screen_base); framebuffer_release(info); return ret; } |