adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-27 19:26:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

p9100: use standard fields for framebuffer physical address and length

Browse source 
Use standard fields fbinfo.fix.smem_start and fbinfo.fix.smem_len
for physical address and length of framebuffer.

This also fixes output of the 'fbset -i' command - address and length
of the framebuffer are displayed correctly.

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Krzysztof Helt 2009-05-04 10:42:57 +00:00 committed by David S. Miller
parent 8803f7afe6
commit 0d76cb2606
1 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/video/p9100.c
View file

@ -134,9 +134,7 @@ struct p9100_par {
u32 flags; u32 flags;
#define P9100_FLAG_BLANKED 0x00000001 #define P9100_FLAG_BLANKED 0x00000001
unsigned long physbase;
unsigned long which_io; unsigned long which_io;
unsigned long fbsize;
}; };
/** /**
@ -224,18 +222,16 @@ static int p9100_mmap(struct fb_info *info, struct vm_area_struct *vma)
struct p9100_par *par = (struct p9100_par *)info->par; struct p9100_par *par = (struct p9100_par *)info->par;
return sbusfb_mmap_helper(p9100_mmap_map, return sbusfb_mmap_helper(p9100_mmap_map,
par->physbase, par->fbsize, info->fix.smem_start, info->fix.smem_len,
par->which_io, vma); par->which_io, vma);
} }
static int p9100_ioctl(struct fb_info *info, unsigned int cmd, static int p9100_ioctl(struct fb_info *info, unsigned int cmd,
unsigned long arg) unsigned long arg)
{ {
struct p9100_par *par = (struct p9100_par *) info->par;
/* Make it look like a cg3. */ /* Make it look like a cg3. */
return sbusfb_ioctl_helper(cmd, arg, info, return sbusfb_ioctl_helper(cmd, arg, info,
FBTYPE_SUN3COLOR, 8, par->fbsize); FBTYPE_SUN3COLOR, 8, info->fix.smem_len);
} }
/* /*
@ -271,7 +267,7 @@ static int __devinit p9100_probe(struct of_device *op, const struct of_device_id
spin_lock_init(&par->lock); spin_lock_init(&par->lock);
/* This is the framebuffer and the only resource apps can mmap. */ /* This is the framebuffer and the only resource apps can mmap. */
par->physbase = op->resource[2].start; info->fix.smem_start = op->resource[2].start;
par->which_io = op->resource[2].flags & IORESOURCE_BITS; par->which_io = op->resource[2].flags & IORESOURCE_BITS;
sbusfb_fill_var(&info->var, dp, 8); sbusfb_fill_var(&info->var, dp, 8);
@ -280,7 +276,7 @@ static int __devinit p9100_probe(struct of_device *op, const struct of_device_id
info->var.blue.length = 8; info->var.blue.length = 8;
linebytes = of_getintprop_default(dp, "linebytes", info->var.xres); linebytes = of_getintprop_default(dp, "linebytes", info->var.xres);
par->fbsize = PAGE_ALIGN(linebytes * info->var.yres); info->fix.smem_len = PAGE_ALIGN(linebytes * info->var.yres);
par->regs = of_ioremap(&op->resource[0], 0, par->regs = of_ioremap(&op->resource[0], 0,
sizeof(struct p9100_regs), "p9100 regs"); sizeof(struct p9100_regs), "p9100 regs");
@ -290,7 +286,7 @@ static int __devinit p9100_probe(struct of_device *op, const struct of_device_id
info->flags = FBINFO_DEFAULT; info->flags = FBINFO_DEFAULT;
info->fbops = &p9100_ops; info->fbops = &p9100_ops;
info->screen_base = of_ioremap(&op->resource[2], 0, info->screen_base = of_ioremap(&op->resource[2], 0,
par->fbsize, "p9100 ram"); info->fix.smem_len, "p9100 ram");
if (!info->screen_base) if (!info->screen_base)
goto out_unmap_regs; goto out_unmap_regs;
@ -311,7 +307,7 @@ static int __devinit p9100_probe(struct of_device *op, const struct of_device_id
printk(KERN_INFO "%s: p9100 at %lx:%lx\n", printk(KERN_INFO "%s: p9100 at %lx:%lx\n",
dp->full_name, dp->full_name,
par->which_io, par->physbase); par->which_io, info->fix.smem_start);
return 0; return 0;
@ -319,7 +315,7 @@ out_dealloc_cmap:
fb_dealloc_cmap(&info->cmap); fb_dealloc_cmap(&info->cmap);
out_unmap_screen: out_unmap_screen:
of_iounmap(&op->resource[2], info->screen_base, par->fbsize); of_iounmap(&op->resource[2], info->screen_base, info->fix.smem_len);
out_unmap_regs: out_unmap_regs:
of_iounmap(&op->resource[0], par->regs, sizeof(struct p9100_regs)); of_iounmap(&op->resource[0], par->regs, sizeof(struct p9100_regs));
@ -340,7 +336,7 @@ static int __devexit p9100_remove(struct of_device *op)
fb_dealloc_cmap(&info->cmap); fb_dealloc_cmap(&info->cmap);
of_iounmap(&op->resource[0], par->regs, sizeof(struct p9100_regs)); of_iounmap(&op->resource[0], par->regs, sizeof(struct p9100_regs));
of_iounmap(&op->resource[2], info->screen_base, par->fbsize); of_iounmap(&op->resource[2], info->screen_base, info->fix.smem_len);
framebuffer_release(info); framebuffer_release(info);