diff --git a/src/add-ons/accelerants/nvidia/engine/nv_general.c b/src/add-ons/accelerants/nvidia/engine/nv_general.c index 24b745e7d7..0a2f2c5aa9 100644 --- a/src/add-ons/accelerants/nvidia/engine/nv_general.c +++ b/src/add-ons/accelerants/nvidia/engine/nv_general.c @@ -32,7 +32,7 @@ static void nv_dump_configuration_space (void) DUMP_CFG (BASE7, 0); DUMP_CFG (SUBSYSID1,0); DUMP_CFG (ROMBASE, 0); - DUMP_CFG (CFG_0, 0); + DUMP_CFG (CAPPTR, 0); DUMP_CFG (CFG_1, 0); DUMP_CFG (INTERRUPT,0); DUMP_CFG (SUBSYSID2,0); @@ -50,9 +50,9 @@ static void nv_dump_configuration_space (void) DUMP_CFG (CFG_15, 0); DUMP_CFG (CFG_16, 0); DUMP_CFG (CFG_17, 0); - DUMP_CFG (GF2IGPU, 0); + DUMP_CFG (CFG_18, 0); + DUMP_CFG (CFG_19, 0); DUMP_CFG (CFG_19, 0); - DUMP_CFG (GF4MXIGPU,0); DUMP_CFG (CFG_21, 0); DUMP_CFG (CFG_22, 0); DUMP_CFG (CFG_23, 0); @@ -80,7 +80,7 @@ status_t nv_general_powerup() { status_t status; - LOG(1,("POWERUP: nVidia (open)BeOS Accelerant 0.21 running.\n")); + LOG(1,("POWERUP: nVidia (open)BeOS Accelerant 0.22 running.\n")); /* preset no laptop */ si->ps.laptop = false; diff --git a/src/add-ons/accelerants/nvidia/engine/nv_info.c b/src/add-ons/accelerants/nvidia/engine/nv_info.c index dc1ef12bfc..67235abaae 100644 --- a/src/add-ons/accelerants/nvidia/engine/nv_info.c +++ b/src/add-ons/accelerants/nvidia/engine/nv_info.c @@ -1,7 +1,7 @@ /* Read initialisation information from card */ /* some bits are hacks, where PINS is not known */ /* Author: - Rudolf Cornelissen 7/2003-6/2004 + Rudolf Cornelissen 7/2003-7/2004 */ #define MODULE_BIT 0x00002000 @@ -1051,14 +1051,10 @@ static void getstrap_arch_nv10_20_30(void) switch (dev_manID) { case 0x01a010de: /* Nvidia GeForce2 Integrated GPU */ - //fixme: need kerneldriver function to readout other device PCI config space!?! - //linux: int amt = pciReadLong(pciTag(0, 0, 1), 0x7C); - si->ps.memory_size = (((CFGR(GF2IGPU) & 0x000007c0) >> 6) + 1); - break; case 0x01f010de: /* Nvidia GeForce4 MX Integrated GPU */ - //fixme: need kerneldriver function to readout other device PCI config space!?! - //linux: int amt = pciReadLong(pciTag(0, 0, 1), 0x84); - si->ps.memory_size = (((CFGR(GF4MXIGPU) & 0x000007f0) >> 4) + 1); + /* the kerneldriver already determined the amount of RAM these cards have at + * their disposal (UMA, values read from PCI config space in other device) */ + LOG(8,("INFO: nVidia GPU with UMA detected\n")); break; default: LOG(8,("INFO: (Memory detection) Strapinfo value is: $%08x\n", strapinfo));