aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-s3c2442
diff options
context:
space:
mode:
authorJorge Zapata <turran@openmoko.com>2009-02-19 16:42:54 +0100
committerThomas White <taw@bitwiz.org.uk>2009-03-26 21:34:10 +0000
commit22a1cc6ef8c82c485136be49eeca90777e8ac85c (patch)
tree0342597686a6bad6bf6ef9fcfa3c54fc4622abe5 /arch/arm/mach-s3c2442
parente1179bc8e2bfa379e178e1f206b4687df71755f1 (diff)
Import part of Thomas White DRM tree:
Handle new memory layout. The "not-needed" memory should not be taken by the framebuffer driver. Use that for the DRM driver. Add the cmdq platform device Set aside 4k for hardware cursor, reject cursors that don't fit.
Diffstat (limited to 'arch/arm/mach-s3c2442')
-rw-r--r--arch/arm/mach-s3c2442/mach-gta02.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2442/mach-gta02.c b/arch/arm/mach-s3c2442/mach-gta02.c
index e1f8b9b2fd6..d469d033afd 100644
--- a/arch/arm/mach-s3c2442/mach-gta02.c
+++ b/arch/arm/mach-s3c2442/mach-gta02.c
@@ -1397,7 +1397,8 @@ static struct glamofb_platform_data gta02_glamo_pdata = {
.lower_margin = 16,
.hsync_len = 8,
.vsync_len = 2,
- .fb_mem_size = 0x400000, /* glamo has 8 megs of SRAM. we use 4 */
+ //.fb_mem_size = 0x400000, /* glamo has 8 megs of SRAM. we use 4 */
+ .fb_mem_size = 0x12c000, /* 640 x 480 x 4 = 1200 kiB */
.xres = {
.min = 240,
.max = 640,