[Mplayer-cvslog] CVS: main/drivers/radeon radeonfb.c,1.22,1.23

[Alex Beregszaszi]

Update of /cvsroot/mplayer/main/drivers/radeon
In directory mail:/var/tmp.root/cvs-serv17348

Modified Files:
	radeonfb.c 
Log Message:
M6 bug workaround by Hanno Bock <hanno at gmx.de>

Index: radeonfb.c
===================================================================
RCS file: /cvsroot/mplayer/main/drivers/radeon/radeonfb.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- radeonfb.c	22 Dec 2002 16:31:00 -0000	1.22
+++ radeonfb.c	13 Jan 2003 10:08:21 -0000	1.23
@@ -1108,6 +1108,16 @@
 	/* mem size is bits [28:0], mask off the rest */
 	rinfo->video_ram = tmp & CONFIG_MEMSIZE_MASK;
 
+	/* according to XFree86 4.2.0, some production M6's return
+	   0 for 8MB */
+	if (rinfo->video_ram == 0 && 
+	    (pdev->device == PCI_DEVICE_ID_RADEON_LY ||
+	     pdev->device == PCI_DEVICE_ID_RADEON_LZ))
+	{
+	    rinfo->video_ram = 8192*1024;
+	    printk("radeonfb: workarounding buggy Radeon M6 (0 vs 8MB memory)\n");
+	}
+
 	/* ram type */
 	rinfo->MemCntl = INREG(MEM_SDRAM_MODE_REG);
 	switch ((MEM_CFG_TYPE & rinfo->MemCntl) >> 30) {