# HG changeset patch
# User nick
# Date 1001492077 0
# Node ID 4e3e03effdac96d77e1ed0f386ea2219ed206177
# Parent  9d528800f110fe4d88b49b9b6cbfa9fcaa535c1a
Radeon2 support

diff -r 9d528800f110 -r 4e3e03effdac drivers/radeon/radeon.h
--- a/drivers/radeon/radeon.h	Wed Sep 26 06:33:38 2001 +0000
+++ b/drivers/radeon/radeon.h	Wed Sep 26 08:14:37 2001 +0000
@@ -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
 
diff -r 9d528800f110 -r 4e3e03effdac drivers/radeon/radeonfb.c
--- a/drivers/radeon/radeonfb.c	Wed Sep 26 06:33:38 2001 +0000
+++ b/drivers/radeon/radeonfb.c	Wed Sep 26 08:14:37 2001 +0000
@@ -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;
@@ -794,6 +799,16 @@
 			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,
 				    pci_resource_len(pdev, 2));