From 76da25cab4c188b5660db99b175c8d2784d81717 Mon Sep 17 00:00:00 2001 From: Rudolf Cornelissen Date: Sat, 17 Sep 2005 08:44:34 +0000 Subject: [PATCH] added chip_rev fetching code, updated doc. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14195 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../kernel/drivers/graphics/via/UPDATE.html | 6 ++--- .../kernel/drivers/graphics/via/driver.c | 27 +++---------------- 2 files changed, 6 insertions(+), 27 deletions(-) diff --git a/src/add-ons/kernel/drivers/graphics/via/UPDATE.html b/src/add-ons/kernel/drivers/graphics/via/UPDATE.html index b08e8e65fd..733ea9c426 100644 --- a/src/add-ons/kernel/drivers/graphics/via/UPDATE.html +++ b/src/add-ons/kernel/drivers/graphics/via/UPDATE.html @@ -4,7 +4,7 @@

Changes done for each driverversion:

-

via_driver (SVN 0.11, Rudolf)

+

via_driver (SVN 0.12, Rudolf)

Still todo:

@@ -31,6 +31,6 @@


Rudolf Cornelissen. -

(Page last updated on September 15, 2005)

+

(Page last updated on September 17, 2005)

diff --git a/src/add-ons/kernel/drivers/graphics/via/driver.c b/src/add-ons/kernel/drivers/graphics/via/driver.c index 2334651c19..7cb40b9c40 100644 --- a/src/add-ons/kernel/drivers/graphics/via/driver.c +++ b/src/add-ons/kernel/drivers/graphics/via/driver.c @@ -4,7 +4,7 @@ Other authors: Mark Watson; - Rudolf Cornelissen 3/2002-11/2004. + Rudolf Cornelissen 3/2002-9/2005. */ /* standard kernel driver stuff */ @@ -670,29 +670,8 @@ static status_t open_hook (const char* name, uint32 flags, void** cookie) { si->device = di->pcii.device; si->function = di->pcii.function; - /* note the amount of system RAM the system BIOS assigned to the card if applicable: - * unified memory architecture (UMA) */ - switch ((((uint32)(si->device_id)) << 16) | si->vendor_id) - { - case 0x01a010de: /* Nvidia GeForce2 Integrated GPU */ - /* device at bus #0, device #0, function #1 holds value at byte-index 0x7C */ - si->ps.memory_size = 1024 * 1024 * - (((((*pci_bus->read_pci_config)(0, 0, 1, 0x7c, 4)) & 0x000007c0) >> 6) + 1); - /* last 64kB RAM is used for the BIOS (or something else?) */ - si->ps.memory_size -= (64 * 1024); - break; - case 0x01f010de: /* Nvidia GeForce4 MX Integrated GPU */ - /* device at bus #0, device #0, function #1 holds value at byte-index 0x84 */ - si->ps.memory_size = 1024 * 1024 * - (((((*pci_bus->read_pci_config)(0, 0, 1, 0x84, 4)) & 0x000007f0) >> 4) + 1); - /* last 64kB RAM is used for the BIOS (or something else?) */ - si->ps.memory_size -= (64 * 1024); - break; - default: - /* all other cards have own RAM: the amount of which is determined in the - * accelerant. */ - break; - } + /* device at bus #0, device #0, function #0 holds byte value at byte-index 0xf6 */ + si->ps.chip_rev = ((*pci_bus->read_pci_config)(0, 0, 0, 0xf6, 1)); /* map the device */ result = map_device(di);