From 1f4825089031cd29b5bcc18f534595845bfec180 Mon Sep 17 00:00:00 2001 From: Rudolf Cornelissen Date: Tue, 9 Oct 2007 20:05:43 +0000 Subject: [PATCH] updated naming for some previous unknown cards, added 24 new cards for support/recognition in the kernel driver, being GF 6xxx, 7xxx and 8xxx types. Also two more nforce 6100 4x0 cards recognized now. NOTE: accelerant update will come at a later date (soon I hope), needs more investigation first. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22497 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../kernel/drivers/graphics/nvidia/driver.c | 49 +++++++++++-------- 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/src/add-ons/kernel/drivers/graphics/nvidia/driver.c b/src/add-ons/kernel/drivers/graphics/nvidia/driver.c index 51f9c34009..88f030d1cf 100644 --- a/src/add-ons/kernel/drivers/graphics/nvidia/driver.c +++ b/src/add-ons/kernel/drivers/graphics/nvidia/driver.c @@ -4,7 +4,7 @@ Other authors: Mark Watson; - Rudolf Cornelissen 3/2002-4/2006. + Rudolf Cornelissen 3/2002-10/2007. */ @@ -108,9 +108,10 @@ static uint16 nvidia_device_list[] = { 0x0040, /* Nvidia GeForce FX 6800 Ultra */ 0x0041, /* Nvidia GeForce FX 6800 */ 0x0042, /* Nvidia GeForce FX 6800LE */ - 0x0043, /* Nvidia unknown FX */ + 0x0043, /* Nvidia GeForce 6800 XE */ 0x0045, /* Nvidia GeForce FX 6800 GT */ 0x0046, /* Nvidia GeForce FX 6800 GT */ + 0x0047, /* Nvidia GeForce 6800 GS */ 0x0048, /* Nvidia GeForce FX 6800 XT */ 0x0049, /* Nvidia unknown FX */ 0x004d, /* Nvidia Quadro FX 4400 */ @@ -121,7 +122,7 @@ static uint16 nvidia_device_list[] = { 0x0099, /* Nvidia Geforce 7800 GTX Go PCIe */ 0x009d, /* Nvidia Quadro FX 4500 */ 0x00a0, /* Nvidia Aladdin TNT2 */ - 0x00c0, /* Nvidia unknown FX */ + 0x00c0, /* Nvidia GeForce 6800 GS */ 0x00c1, /* Nvidia GeForce FX 6800 */ 0x00c2, /* Nvidia GeForce FX 6800LE */ 0x00c3, /* Nvidia GeForce FX 6800 XT */ @@ -134,7 +135,9 @@ static uint16 nvidia_device_list[] = { 0x00f1, /* Nvidia GeForce FX 6600 GT AGP */ 0x00f2, /* Nvidia GeForce FX 6600 AGP */ 0x00f3, /* Nvidia GeForce 6200 */ + 0x00f4, /* Nvidia GeForce 6600 LE */ 0x00f5, /* Nvidia GeForce FX 7800 GS AGP */ + 0x00f6, /* Nvidia GeForce 6800 GS */ 0x00f8, /* Nvidia Quadro FX 3400/4400 PCIe */ 0x00f9, /* Nvidia GeForce PCX 6800 PCIe */ 0x00fa, /* Nvidia GeForce PCX 5750 PCIe */ @@ -154,7 +157,7 @@ static uint16 nvidia_device_list[] = { 0x0140, /* Nvidia GeForce FX 6600 GT */ 0x0141, /* Nvidia GeForce FX 6600 */ 0x0142, /* Nvidia GeForce FX 6600LE */ - 0x0143, /* Nvidia unknown FX */ + 0x0143, /* Nvidia GeForce 6600 VE */ 0x0144, /* Nvidia GeForce FX 6600 Go */ 0x0145, /* Nvidia GeForce FX 6610 XL */ 0x0146, /* Nvidia GeForce FX 6600 TE Go / 6200 TE Go */ @@ -162,7 +165,7 @@ static uint16 nvidia_device_list[] = { 0x0148, /* Nvidia GeForce FX 6600 Go */ 0x0149, /* Nvidia GeForce FX 6600 GT Go */ 0x014b, /* Nvidia unknown FX */ - 0x014c, /* Nvidia unknown FX */ + 0x014c, /* Nvidia Quadro FX 540 MXM */ 0x014d, /* Nvidia unknown FX */ 0x014e, /* Nvidia Quadro FX 540 */ 0x014f, /* Nvidia GeForce 6200 PCIe (128Mb) */ @@ -210,9 +213,13 @@ static uint16 nvidia_device_list[] = { 0x018b, /* Nvidia Quadro4 380 XGL */ 0x018c, /* Nvidia Quadro4 NVS 50 PCI */ 0x018d, /* Nvidia GeForce4 448 Go */ + 0x0191, /* Nvidia GeForce 8800 GTX */ + 0x0193, /* Nvidia GeForce 8800 GTS */ 0x01a0, /* Nvidia GeForce2 Integrated GPU */ 0x01d1, /* Nvidia GeForce 7300 LE */ + 0x01d3, /* Nvidia GeForce 7300 SE */ 0x01d8, /* Nvidia GeForce 7400 GO */ + 0x01dd, /* Nvidia GeForce 7500 LE */ 0x01df, /* Nvidia GeForce 7300 GS */ 0x01f0, /* Nvidia GeForce4 MX Integrated GPU */ 0x0200, /* Nvidia GeForce3 */ @@ -222,6 +229,7 @@ static uint16 nvidia_device_list[] = { 0x0211, /* Nvidia GeForce FX 6800 */ 0x0212, /* Nvidia GeForce FX 6800LE */ 0x0215, /* Nvidia GeForce FX 6800 GT */ + 0x0218, /* Nvidia GeForce 6800 XT */ 0x0220, /* Nvidia unknown FX */ 0x0221, /* Nvidia GeForce 6200 AGP (256Mb - 128bit) */ 0x0222, /* Nvidia unknown FX */ @@ -229,6 +237,7 @@ static uint16 nvidia_device_list[] = { 0x0240, /* Nvidia GeForce 6150 (NFORCE4 Integr.GPU) */ 0x0241, /* Nvidia GeForce 6150 LE (NFORCE4 Integr.GPU) */ 0x0242, /* Nvidia GeForce 6100 (NFORCE4 Integr.GPU) */ + 0x0245, /* Nvidia Quadro NVS 210S / GeForce 6150LE */ 0x0250, /* Nvidia GeForce4 Ti 4600 */ 0x0251, /* Nvidia GeForce4 Ti 4400 */ 0x0252, /* Nvidia GeForce4 Ti 4600 */ @@ -245,6 +254,13 @@ static uint16 nvidia_device_list[] = { 0x028c, /* Nvidia Quadro4 700 GoGL */ 0x0290, /* Nvidia GeForce 7900 GTX */ 0x0291, /* Nvidia GeForce 7900 GT */ + 0x0293, /* Nvidia GeForce 7900 GX2 */ + 0x0294, /* Nvidia GeForce 7950 GX2 */ + 0x0295, /* Nvidia GeForce 7950 GT */ + 0x0298, /* Nvidia GeForce Go 7900 GS */ + 0x0299, /* Nvidia GeForce Go 7900 GTX */ + 0x029c, /* Nvidia Quadro FX 5500 */ + 0x029f, /* Nvidia Quadro FX 4500 X2 */ 0x02a0, /* Nvidia GeForce3 Integrated GPU */ 0x02e1, /* Nvidia GeForce 7600 GS */ 0x0301, /* Nvidia GeForce FX 5800 Ultra */ @@ -301,25 +317,18 @@ static uint16 nvidia_device_list[] = { 0x0391, /* Nvidia GeForce 7600 GT */ 0x0392, /* Nvidia GeForce 7600 GS */ 0x0393, /* Nvidia GeForce 7300 GT */ + 0x0394, /* Nvidia GeForce 7600 LE */ 0x0398, /* Nvidia GeForce 7600 GO */ + 0x03d0, /* Nvidia GeForce 6100 nForce 430 */ 0x03d1, /* Nvidia GeForce 6100 nForce 405 */ + 0x03d2, /* Nvidia GeForce 6100 nForce 400 */ + 0x0400, /* Nvidia GeForce 8600 GTS */ + 0x0402, /* Nvidia GeForce 8600 GT */ + 0x0421, /* Nvidia GeForce 8500 GT */ + 0x0422, /* Nvidia GeForce 8400 GS */ + 0x0423, /* Nvidia GeForce 8300 GS */ 0 }; -/* - not yet included nVidia ID's that are unknown, but used according to nvidia: - 0x0090 //g70 - 0x0093 //g70 - 0x0094 //g70 - 0x009c //g70 - 0x009e //g70 - 0x0210 //nv48 - 0x021d //nv48 (existing? not in nvidia list) - 0x021e //nv48 (existing? not in nvidia list) - - The following ranges seem to exist as well, but no cards are defined yet: - 0x012x //nv41? - 0x023x //nv44 type 2? (0x022x is also type 2) -*/ static uint16 elsa_device_list[] = { 0x0c60, /* Elsa Gladiac Geforce2 MX */