[Mplayer-cvslog] CVS: main/drivers/radeon radeonfb.c,1.8,1.9 radeon.h,1.6,1.7

[Nick Kurshev]

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

Modified Files:
	radeonfb.c radeon.h 
Log Message:
Radeon2 support

Index: radeonfb.c
===================================================================
RCS file: /cvsroot/mplayer/main/drivers/radeon/radeonfb.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- radeonfb.c	26 Sep 2001 06:33:38 -0000	1.8
+++ radeonfb.c	26 Sep 2001 08:14:36 -0000	1.9
@@ -102,7 +102,9 @@
 	RADEON_QZ,
 	RADEON_LY,
 	RADEON_LZ,
-	RADEON_LW
+	RADEON_LW,
+	R200_QL,
+	RV200_QW
 };
 
 enum radeon_montype
@@ -143,6 +145,8 @@
 	{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_RADEON_LY, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RADEON_LY},
 	{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_RADEON_LZ, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RADEON_LZ},
 	{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_RADEON_LW, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RADEON_LW},
+	{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_R200_QL, PCI_ANY_ID, PCI_ANY_ID, 0, 0, R200_QL},
+	{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_RV200_QW, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RV200_QW},
 	{ 0, }
 };
 MODULE_DEVICE_TABLE(pci, radeonfb_pci_table);
@@ -248,7 +252,7 @@
 	struct radeon_regs state;
 	struct radeon_regs init_state;
 
-	char name[14];
+	char name[17];
 	char ram_type[12];
 
 	int hasCRTC2;
@@ -256,6 +260,7 @@
 	int dviDispType;
 	int hasTVout;
 	int isM7;
+	int isR200;
 
 	u32 mmio_base_phys;
 	u32 fb_base_phys;
@@ -793,6 +798,16 @@
 			rinfo->hasCRTC2 = 1;
 			rinfo->isM7 = 1;
 			strcpy(rinfo->name, "Radeon M7 LW ");
+			break;
+		case PCI_DEVICE_ID_R200_QL:
+			rinfo->hasCRTC2 = 1;
+			rinfo->isR200 = 1;
+			strcpy(rinfo->name, "Radeon2 8500 LW ");
+			break;
+		case PCI_DEVICE_ID_RV200_QW:
+			rinfo->hasCRTC2 = 1;
+			rinfo->isM7 = 1;
+			strcpy(rinfo->name, "Radeon2 7500 QW ");
 			break;
 		default:
 			release_mem_region (rinfo->mmio_base_phys,

Index: radeon.h
===================================================================
RCS file: /cvsroot/mplayer/main/drivers/radeon/radeon.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- radeon.h	24 Sep 2001 05:54:29 -0000	1.6
+++ radeon.h	26 Sep 2001 08:14:37 -0000	1.7
@@ -12,6 +12,8 @@
 #define PCI_DEVICE_ID_RADEON_LY		0x4C59
 #define PCI_DEVICE_ID_RADEON_LZ		0x4C5A
 #define PCI_DEVICE_ID_RADEON_LW		0x4C57
+#define PCI_DEVICE_ID_R200_QL		0x514C
+#define PCI_DEVICE_ID_RV200_QW		0x5157
 
 #define RADEON_REGSIZE			0x4000