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

tcx: 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>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Krzysztof Helt 2009-06-16 15:34:39 -07:00 committed by Linus Torvalds
parent 4410f39109
commit fe3a1aa239
1 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
drivers/video/tcx.c
View file

@ -116,17 +116,16 @@ struct tcx_par {
u32 flags; u32 flags;
#define TCX_FLAG_BLANKED 0x00000001 #define TCX_FLAG_BLANKED 0x00000001
unsigned long physbase;
unsigned long which_io; unsigned long which_io;
unsigned long fbsize;
struct sbus_mmap_map mmap_map[TCX_MMAP_ENTRIES]; struct sbus_mmap_map mmap_map[TCX_MMAP_ENTRIES];
int lowdepth; int lowdepth;
}; };
/* Reset control plane so that WID is 8-bit plane. */ /* Reset control plane so that WID is 8-bit plane. */
static void __tcx_set_control_plane(struct tcx_par *par) static void __tcx_set_control_plane(struct fb_info *info)
{ {
struct tcx_par *par = info->par;
u32 __iomem *p, *pend; u32 __iomem *p, *pend;
if (par->lowdepth) if (par->lowdepth)
@ -135,7 +134,7 @@ static void __tcx_set_control_plane(struct tcx_par *par)
p = par->cplane; p = par->cplane;
if (p == NULL) if (p == NULL)
return; return;
for (pend = p + par->fbsize; p < pend; p++) { for (pend = p + info->fix.smem_len; p < pend; p++) {
u32 tmp = sbus_readl(p); u32 tmp = sbus_readl(p);
tmp &= 0xffffff; tmp &= 0xffffff;
@ -149,7 +148,7 @@ static void tcx_reset(struct fb_info *info)
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&par->lock, flags); spin_lock_irqsave(&par->lock, flags);
__tcx_set_control_plane(par); __tcx_set_control_plane(info);
spin_unlock_irqrestore(&par->lock, flags); spin_unlock_irqrestore(&par->lock, flags);
} }
@ -304,7 +303,7 @@ static int tcx_mmap(struct fb_info *info, struct vm_area_struct *vma)
struct tcx_par *par = (struct tcx_par *)info->par; struct tcx_par *par = (struct tcx_par *)info->par;
return sbusfb_mmap_helper(par->mmap_map, return sbusfb_mmap_helper(par->mmap_map,
par->physbase, par->fbsize, info->fix.smem_start, info->fix.smem_len,
par->which_io, vma); par->which_io, vma);
} }
@ -316,7 +315,7 @@ static int tcx_ioctl(struct fb_info *info, unsigned int cmd,
return sbusfb_ioctl_helper(cmd, arg, info, return sbusfb_ioctl_helper(cmd, arg, info,
FBTYPE_TCXCOLOR, FBTYPE_TCXCOLOR,
(par->lowdepth ? 8 : 24), (par->lowdepth ? 8 : 24),
par->fbsize); info->fix.smem_len);
} }
/* /*
@ -358,10 +357,10 @@ static void tcx_unmap_regs(struct of_device *op, struct fb_info *info,
par->bt, sizeof(struct bt_regs)); par->bt, sizeof(struct bt_regs));
if (par->cplane) if (par->cplane)
of_iounmap(&op->resource[4], of_iounmap(&op->resource[4],
par->cplane, par->fbsize * sizeof(u32)); par->cplane, info->fix.smem_len * sizeof(u32));
if (info->screen_base) if (info->screen_base)
of_iounmap(&op->resource[0], of_iounmap(&op->resource[0],
info->screen_base, par->fbsize); info->screen_base, info->fix.smem_len);
} }
static int __devinit tcx_probe(struct of_device *op, static int __devinit tcx_probe(struct of_device *op,
@ -391,7 +390,7 @@ static int __devinit tcx_probe(struct of_device *op,
linebytes = of_getintprop_default(dp, "linebytes", linebytes = of_getintprop_default(dp, "linebytes",
info->var.xres); info->var.xres);
par->fbsize = PAGE_ALIGN(linebytes * info->var.yres); info->fix.smem_len = PAGE_ALIGN(linebytes * info->var.yres);
par->tec = of_ioremap(&op->resource[7], 0, par->tec = of_ioremap(&op->resource[7], 0,
sizeof(struct tcx_tec), "tcx tec"); sizeof(struct tcx_tec), "tcx tec");
@ -400,7 +399,7 @@ static int __devinit tcx_probe(struct of_device *op,
par->bt = of_ioremap(&op->resource[8], 0, par->bt = of_ioremap(&op->resource[8], 0,
sizeof(struct bt_regs), "tcx dac"); sizeof(struct bt_regs), "tcx dac");
info->screen_base = of_ioremap(&op->resource[0], 0, info->screen_base = of_ioremap(&op->resource[0], 0,
par->fbsize, "tcx ram"); info->fix.smem_len, "tcx ram");
if (!par->tec || !par->thc || if (!par->tec || !par->thc ||
!par->bt || !info->screen_base) !par->bt || !info->screen_base)
goto out_unmap_regs; goto out_unmap_regs;
@ -408,7 +407,7 @@ static int __devinit tcx_probe(struct of_device *op,
memcpy(&par->mmap_map, &__tcx_mmap_map, sizeof(par->mmap_map)); memcpy(&par->mmap_map, &__tcx_mmap_map, sizeof(par->mmap_map));
if (!par->lowdepth) { if (!par->lowdepth) {
par->cplane = of_ioremap(&op->resource[4], 0, par->cplane = of_ioremap(&op->resource[4], 0,
par->fbsize * sizeof(u32), info->fix.smem_len * sizeof(u32),
"tcx cplane"); "tcx cplane");
if (!par->cplane) if (!par->cplane)
goto out_unmap_regs; goto out_unmap_regs;
@ -419,7 +418,7 @@ static int __devinit tcx_probe(struct of_device *op,
par->mmap_map[6].size = SBUS_MMAP_EMPTY; par->mmap_map[6].size = SBUS_MMAP_EMPTY;
} }
par->physbase = op->resource[0].start; info->fix.smem_start = op->resource[0].start;
par->which_io = op->resource[0].flags & IORESOURCE_BITS; par->which_io = op->resource[0].flags & IORESOURCE_BITS;
for (i = 0; i < TCX_MMAP_ENTRIES; i++) { for (i = 0; i < TCX_MMAP_ENTRIES; i++) {
@ -473,7 +472,7 @@ static int __devinit tcx_probe(struct of_device *op,
printk(KERN_INFO "%s: TCX at %lx:%lx, %s\n", printk(KERN_INFO "%s: TCX at %lx:%lx, %s\n",
dp->full_name, dp->full_name,
par->which_io, par->which_io,
par->physbase, info->fix.smem_start,
par->lowdepth ? "8-bit only" : "24-bit depth"); par->lowdepth ? "8-bit only" : "24-bit depth");
return 0; return 0;