From baf432d5f68ebc071962e46ab45bd0ad511de5b3 Mon Sep 17 00:00:00 2001 From: Rudolf Cornelissen Date: Wed, 16 Jun 2010 19:32:31 +0000 Subject: [PATCH] added recognition for case 0x03d510de: /* Nvidia Geforce 6100 nForce 420 */ git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37157 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../accelerants/nvidia/engine/nv_general.c | 19 +++++++++++++------ .../kernel/drivers/graphics/nvidia/driver.c | 1 + 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/add-ons/accelerants/nvidia/engine/nv_general.c b/src/add-ons/accelerants/nvidia/engine/nv_general.c index cc21a9dc06..67fa323d6b 100644 --- a/src/add-ons/accelerants/nvidia/engine/nv_general.c +++ b/src/add-ons/accelerants/nvidia/engine/nv_general.c @@ -797,17 +797,23 @@ status_t nv_general_powerup() status = nvxx_general_powerup(); break; case 0x024010de: /* Nvidia Geforce 6150 (NFORCE4 Integr.GPU) */ + si->ps.card_type = NV44; + si->ps.card_arch = NV40A; + sprintf(si->adi.name, "Nvidia Geforce 6150, C51PV"); + sprintf(si->adi.chipset, "NV44"); + status = nvxx_general_powerup(); + break; case 0x024110de: /* Nvidia Geforce 6150 LE (NFORCE4 Integr.GPU) */ si->ps.card_type = NV44; si->ps.card_arch = NV40A; - sprintf(si->adi.name, "Nvidia Geforce 6150"); + sprintf(si->adi.name, "Nvidia Geforce 6150, C51"); sprintf(si->adi.chipset, "NV44"); status = nvxx_general_powerup(); break; case 0x024210de: /* Nvidia Geforce 6100 (NFORCE4 Integr.GPU) */ si->ps.card_type = NV44; si->ps.card_arch = NV40A; - sprintf(si->adi.name, "Nvidia Geforce 6100"); + sprintf(si->adi.name, "Nvidia Geforce 6100, C51G"); sprintf(si->adi.chipset, "NV44"); status = nvxx_general_powerup(); break; @@ -815,14 +821,14 @@ status_t nv_general_powerup() si->ps.card_type = NV44; si->ps.card_arch = NV40A; si->ps.laptop = true; - sprintf(si->adi.name, "Nvidia Geforce 6150 Go"); + sprintf(si->adi.name, "Nvidia Geforce 6150 Go, C51"); sprintf(si->adi.chipset, "NV44"); status = nvxx_general_powerup(); break; case 0x024510de: /* Nvidia Quadro NVS 210S / NVIDIA Geforce 6150LE (NFORCE4 Integr.GPU) */ si->ps.card_type = NV44; si->ps.card_arch = NV40A; - sprintf(si->adi.name, "Nvidia Geforce 6150"); + sprintf(si->adi.name, "Nvidia Geforce 6150, C51"); sprintf(si->adi.chipset, "NV44"); status = nvxx_general_powerup(); break; @@ -830,7 +836,7 @@ status_t nv_general_powerup() si->ps.card_type = NV44; si->ps.card_arch = NV40A; si->ps.laptop = true; - sprintf(si->adi.name, "Nvidia Geforce 6100 Go"); + sprintf(si->adi.name, "Nvidia Geforce 6100 Go, C51"); sprintf(si->adi.chipset, "NV44"); status = nvxx_general_powerup(); break; @@ -1261,9 +1267,10 @@ status_t nv_general_powerup() case 0x03d010de: /* Nvidia Geforce 6100 nForce 430 */ case 0x03d110de: /* Nvidia Geforce 6100 nForce 405 */ case 0x03d210de: /* Nvidia Geforce 6100 nForce 400 */ + case 0x03d510de: /* Nvidia Geforce 6100 nForce 420 */ si->ps.card_type = NV44; si->ps.card_arch = NV40A; - sprintf(si->adi.name, "Nvidia Geforce 6100 nForce"); + sprintf(si->adi.name, "Nvidia Geforce 6100 nForce, C61"); sprintf(si->adi.chipset, "NV44"); status = nvxx_general_powerup(); break; diff --git a/src/add-ons/kernel/drivers/graphics/nvidia/driver.c b/src/add-ons/kernel/drivers/graphics/nvidia/driver.c index f372963ed2..9f844e9c12 100644 --- a/src/add-ons/kernel/drivers/graphics/nvidia/driver.c +++ b/src/add-ons/kernel/drivers/graphics/nvidia/driver.c @@ -325,6 +325,7 @@ static uint16 nvidia_device_list[] = { 0x03d0, /* Nvidia Geforce 6100 nForce 430 */ 0x03d1, /* Nvidia Geforce 6100 nForce 405 */ 0x03d2, /* Nvidia Geforce 6100 nForce 400 */ + 0x03d5, /* Nvidia Geforce 6100 nForce 420 */ 0x07e1, /* Nvidia Geforce 7100 / nForce 630i */ 0 };