Re: Linux-2.6.13-rc7

["Antonino A. Daplas" <adaplas@gmail.com>]

Sebastian Kaergel wrote:
> On Tue, 23 Aug 2005 22:08:13 -0700 (PDT)
> Linus Torvalds <torvalds@osdl.org> wrote:
> 
>> Antonino A. Daplas:
>>   intelfb/fbdev: Save info->flags in a local variable
>> Sylvain Meyer:
>>   intelfb: Do not ioremap entire graphics aperture

Probably this one. If vram is less than stolen size, intelfb
will only ioremap the framebuffer memory, excluding the
ringbuffer and the cursor memory.

Try booting with video=intelfb:accel:0,nohwcursor:0.  If you get
a display, try this patch.

CC'ed Sylvain.

Signed-off-by: Antonino Daplas <adaplas@pol.net>
---

diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c
--- a/drivers/video/intelfb/intelfbdrv.c
+++ b/drivers/video/intelfb/intelfbdrv.c
@@ -502,7 +502,7 @@ intelfb_pci_register(struct pci_dev *pde
 	struct agp_bridge_data *bridge;
  	int aperture_bar = 0;
  	int mmio_bar = 1;
-	int offset;
+	int offset, remap;
 
 	DBG_MSG("intelfb_pci_register\n");
 
@@ -662,11 +662,15 @@ intelfb_pci_register(struct pci_dev *pde
 			+ (dinfo->cursor.size >> 12);
 	}
 
+	if (dinfo->fbmem_gart)
+		remap = (dinfo->fb.offset << 12) + dinfo->fb.size;
+	else
+		remap = (dinfo->cursor.offset << 12) + dinfo->cursor.size;
+
 	/* Map the fb and MMIO regions */
 	/* ioremap only up to the end of used aperture */
 	dinfo->aperture.virtual = (u8 __iomem *)ioremap_nocache
-		(dinfo->aperture.physical, (dinfo->fb.offset << 12)
-		 + dinfo->fb.size);
+		(dinfo->aperture.physical, remap);
 	if (!dinfo->aperture.virtual) {
 		ERR_MSG("Cannot remap FB region.\n");
 		cleanup(dinfo);