Index: gbefb.c
===================================================================
RCS file: /home/cvs/linux/drivers/video/gbefb.c,v
retrieving revision 1.8
diff -u -r1.8 gbefb.c
--- gbefb.c	12 Oct 2004 01:45:47 -0000	1.8
+++ gbefb.c	12 Oct 2004 11:45:55 -0000
@@ -29,6 +29,7 @@
 #endif
 #include <asm/byteorder.h>
 #include <asm/io.h>
+#include <asm/pgalloc.h>
 #include <asm/tlbflush.h>
 
 #include <video/gbe.h>
@@ -386,6 +387,9 @@
 		break;
 
 	case 1:		/* blank */
+	case 2:
+	case 3:
+	case 4:
 		gbe_turn_off();
 		break;
 
@@ -656,12 +660,15 @@
 	switch (bytesPerPixel) {
 	case 1:
 		SET_GBE_FIELD(WID, TYP, val, GBE_CMODE_I8);
+		info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
 		break;
 	case 2:
 		SET_GBE_FIELD(WID, TYP, val, GBE_CMODE_ARGB5);
+		info->fix.visual = FB_VISUAL_TRUECOLOR;
 		break;
 	case 4:
 		SET_GBE_FIELD(WID, TYP, val, GBE_CMODE_RGB8);
+		info->fix.visual = FB_VISUAL_TRUECOLOR;
 		break;
 	}
 	SET_GBE_FIELD(WID, BUF, val, GBE_BMODE_BOTH);
@@ -790,8 +797,12 @@
 
 	/* Initialize the gamma map */
 	udelay(10);
-	for (i = 0; i < 256; i++)
+	for (i = 0; i < 256; i++) {
 		gbe->gmap[i] = (i << 24) | (i << 16) | (i << 8);
+		udelay(10);
+	}
+
+	udelay(10);
 
 	/* Initialize the color map */
 	for (i = 0; i < 256; i++) {
@@ -924,8 +935,8 @@
 		var->yoffset = info->var.yoffset;
 	}
 
-	/* No grayscale for now */
-	var->grayscale = 0;
+	var->xoffset = 0;
+	var->yoffset = 0;
 
 	/* Memory limit */
 	line_length = var->xres_virtual * var->bits_per_pixel / 8;
@@ -999,7 +1010,7 @@
 	pgprot_val(vma->vm_page_prot) =
 		pgprot_fb(pgprot_val(vma->vm_page_prot));
 
-	vma->vm_flags |= VM_IO | VM_RESERVED;
+	vma->vm_flags |= ( VM_IO | VM_RESERVED ) ;
 	vma->vm_file = file;
 
 	/* look for the starting tile */
@@ -1028,6 +1039,7 @@
 	return 0;
 }
 
+
 static struct fb_ops gbefb_ops = {
 	.owner		= THIS_MODULE,
 	.fb_check_var	= gbefb_check_var,
@@ -1112,6 +1124,7 @@
 	struct fb_info *info;
 	struct gbefb_par *par;
 	struct platform_device *p_dev = to_platform_device(dev);
+	unsigned long page, gbe_mem_cac;
 
 	info = framebuffer_alloc(sizeof(struct gbefb_par), &p_dev->dev);
 	if (!info)
@@ -1122,7 +1135,7 @@
 
 	if (fb_get_options("gbefb", &option))
 		return -ENODEV;
-	gbefb_setup(options);
+	gbefb_setup(option);
 #endif
 
 	if (!request_mem_region(GBE_BASE, sizeof(struct sgi_gbe), "GBE")) {
@@ -1131,6 +1144,8 @@
 		goto out_release_framebuffer;
 	}
 
+	dev->coherent_dma_mask = 0xffffffff;
+
 	gbe = (struct sgi_gbe *) ioremap(GBE_BASE, sizeof(struct sgi_gbe));
 	if (!gbe) {
 		printk(KERN_ERR "gbefb: couldn't map mmio region\n");
@@ -1140,7 +1155,7 @@
 	gbe_revision = gbe->ctrlstat & 15;
 
 	gbe_tiles.cpu =
-		dma_alloc_coherent(NULL, GBE_TLB_SIZE * sizeof(uint16_t),
+		dma_alloc_coherent(dev, GBE_TLB_SIZE * sizeof(uint16_t),
 				   &gbe_tiles.dma, GFP_KERNEL);
 	if (!gbe_tiles.cpu) {
 		printk(KERN_ERR "gbefb: couldn't allocate tiles table\n");
@@ -1149,17 +1164,34 @@
 	}
 
 	if (gbe_mem_phys) {
+		printk(KERN_ERR "gbefb: memory already allocated\n");
 		/* memory was allocated at boot time */
 		gbe_mem = ioremap_nocache(gbe_mem_phys, gbe_mem_size);
 		gbe_dma_addr = 0;
 	} else {
+		printk(KERN_ERR "gbefb: allocating memory\n");
 		/* try to allocate memory with the classical allocator
 		 * this has high chance to fail on low memory machines */
-		gbe_mem = dma_alloc_coherent(NULL, gbe_mem_size, &gbe_dma_addr,
+		gbe_mem = dma_alloc_coherent(dev, gbe_mem_size, &gbe_dma_addr,
 					     GFP_KERNEL);
 		gbe_mem_phys = (unsigned long) gbe_dma_addr;
+
 	}
 
+	/* dma_alloc_coherent gives us a "wrong" (UNCAC_ADDR) address, so doing 
+	 * SetPageReserved there has no effect. Use the CAC_ADDR address to do
+	 * SetPageReserved in the correct place. This fixed mmap access...
+	 * XXX: is the above correct ? 
+	 */
+	gbe_mem_cac = (unsigned long)CAC_ADDR(gbe_mem);
+
+	for (page = (unsigned long)gbe_mem_cac; 
+		page < PAGE_ALIGN( ((unsigned long)(gbe_mem_cac + gbe_mem_size)));
+		page += PAGE_SIZE)
+			SetPageReserved(virt_to_page(page));
+
+	flush_cache_all();
+
 #ifdef CONFIG_X86
 	mtrr_add(gbe_mem_phys, gbe_mem_size, MTRR_TYPE_WRCOMB, 1);
 #endif
@@ -1241,6 +1273,7 @@
 			  (void *)gbe_tiles.cpu, gbe_tiles.dma);
 	release_mem_region(GBE_BASE, sizeof(struct sgi_gbe));
 	iounmap(gbe);
+	
 	gbefb_remove_sysfs(dev);
 	framebuffer_release(info);