summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorKrzysztof Helt <krzysztof.h1@wp.pl>2007-08-01 21:39:32 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2007-08-03 14:08:26 -0700
commit3fc701d5d459f3b83ba874613048d36e91debca2 (patch)
tree48e91adb1a6364cc62d716a0e46be8da8c39bf72 /drivers/video
parent63213196fd4b05b9c3539cbe34775c60f1f6fad0 (diff)
downloadlinux-3fc701d5d459f3b83ba874613048d36e91debca2.tar.gz
linux-3fc701d5d459f3b83ba874613048d36e91debca2.tar.bz2
linux-3fc701d5d459f3b83ba874613048d36e91debca2.zip
[CG6]: fix memory size detection
This patch fixes memory size detection on the CG6 card. The 1MB TGX card has dblbuf property set to 0. Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/cg6.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/video/cg6.c b/drivers/video/cg6.c
index 87c747123538..ee9046db9c7d 100644
--- a/drivers/video/cg6.c
+++ b/drivers/video/cg6.c
@@ -677,6 +677,7 @@ static int __devinit cg6_probe(struct of_device *op, const struct of_device_id *
struct fb_info *info;
struct cg6_par *par;
int linebytes, err;
+ int dblbuf;
info = framebuffer_alloc(sizeof(struct cg6_par), &op->dev);
@@ -698,7 +699,9 @@ static int __devinit cg6_probe(struct of_device *op, const struct of_device_id *
linebytes = of_getintprop_default(dp, "linebytes",
info->var.xres);
par->fbsize = PAGE_ALIGN(linebytes * info->var.yres);
- if (of_find_property(dp, "dblbuf", NULL))
+
+ dblbuf = of_getintprop_default(dp, "dblbuf", 0);
+ if (dblbuf)
par->fbsize *= 4;
par->fbc = of_ioremap(&op->resource[0], CG6_FBC_OFFSET,