From 9774e1cf3372f8ca3af7dd1247346e66b1f4a18c Mon Sep 17 00:00:00 2001 From: Rudolf Cornelissen Date: Thu, 9 Jun 2005 17:42:18 +0000 Subject: [PATCH] added/corrected card recognition for some cards, source is official nvidia doc on dev site git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13033 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../accelerants/nvidia/engine/nv_general.c | 26 ++++++++++++++++--- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/src/add-ons/accelerants/nvidia/engine/nv_general.c b/src/add-ons/accelerants/nvidia/engine/nv_general.c index 4c9a017856..0fb340545d 100644 --- a/src/add-ons/accelerants/nvidia/engine/nv_general.c +++ b/src/add-ons/accelerants/nvidia/engine/nv_general.c @@ -167,13 +167,18 @@ status_t nv_general_powerup() status = nvxx_general_powerup(); break; case 0x00c010de: /* Nvidia unknown FX */ - case 0x00c110de: /* Nvidia unknown FX */ - case 0x00c210de: /* Nvidia unknown FX */ //fixme? Xorg says: GeForce 6800 LE si->ps.card_type = NV41; si->ps.card_arch = NV40A; LOG(4,("POWERUP: Detected Nvidia unknown FX (NV41)\n")); status = nvxx_general_powerup(); break; + case 0x00c110de: /* Nvidia GeForce FX 6800 */ + case 0x00c210de: /* Nvidia GeForce FX 6800LE */ + si->ps.card_type = NV40; + si->ps.card_arch = NV40A; + LOG(4,("POWERUP: Detected Nvidia GeForce FX 6800 (NV40)\n")); + status = nvxx_general_powerup(); + break; case 0x00f010de: /* Nvidia GeForce FX 6800 (Ultra) AGP(?) */ si->ps.card_type = NV40; si->ps.card_arch = NV40A; @@ -339,12 +344,17 @@ status_t nv_general_powerup() case 0x016210de: /* Nvidia unknown FX */ case 0x016310de: /* Nvidia unknown FX */ case 0x016410de: /* Nvidia unknown FX */ - case 0x016510de: /* Nvidia unknown FX */ si->ps.card_type = NV44; si->ps.card_arch = NV40A; LOG(4,("POWERUP: Detected Nvidia unknown FX (NV44)\n")); status = nvxx_general_powerup(); break; + case 0x016510de: /* Nvidia Quadro FX NVS 285 */ + si->ps.card_type = NV44; + si->ps.card_arch = NV40A; + LOG(4,("POWERUP: Detected Nvidia Quadro FX NVS 285 (NV44)\n")); + status = nvxx_general_powerup(); + break; case 0x016610de: /* Nvidia unknown FX Go */ si->ps.card_type = NV44; si->ps.card_arch = NV40A; @@ -476,6 +486,14 @@ status_t nv_general_powerup() LOG(4,("POWERUP: Detected Nvidia Quadro DCC (NV20)\n")); status = nvxx_general_powerup(); break; + case 0x021110de: /* Nvidia GeForce FX 6800 */ + case 0x021210de: /* Nvidia GeForce FX 6800LE */ + case 0x021510de: /* Nvidia GeForce FX 6800 GT */ + si->ps.card_type = NV40; + si->ps.card_arch = NV40A; + LOG(4,("POWERUP: Detected Nvidia GeForce FX 6800 (NV40)\n")); + status = nvxx_general_powerup(); + break; case 0x022110de: /* Nvidia GeForce 6200 AGP (256Mb - 128bit) */ si->ps.card_type = NV44; si->ps.card_arch = NV40A; @@ -613,7 +631,7 @@ status_t nv_general_powerup() case 0x032010de: /* Nvidia GeForce FX 5200 */ case 0x032110de: /* Nvidia GeForce FX 5200 Ultra */ case 0x032210de: /* Nvidia GeForce FX 5200 */ - case 0x032310de: /* Nvidia GeForce FX 5200SE */ + case 0x032310de: /* Nvidia GeForce FX 5200LE */ si->ps.card_type = NV34; si->ps.card_arch = NV30A; LOG(4,("POWERUP: Detected Nvidia GeForce FX 5200 (NV34)\n"));