From 4157b3aeec69d4b28ef60108827727b6756f0830 Mon Sep 17 00:00:00 2001
From: Rudolf Cornelissen <rudolf.cornelissen@gmail.com>
Date: Thu, 17 Feb 2005 11:53:25 +0000
Subject: [PATCH] -added the NV40 arch screen connections limitations to the
 doc; -added a fixme comment in the kerneldriver: it seems we must try to map
 cardBIOSes to memory ourselves if possible after all (should be PCI config
 manager work I'd say): encountered two systems now that don't have that done
 (by BIOS I guess). A old PCI-only system (Pentium200), and a brand new PCIe
 system: Both PCI and PCIe cardBIOSes don't get mapped here which prevents us
 from using coldstarts on secondary cards :-/

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@11400 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/add-ons/kernel/drivers/graphics/nvidia/README.html | 6 ++++--
 src/add-ons/kernel/drivers/graphics/nvidia/driver.c    | 4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/add-ons/kernel/drivers/graphics/nvidia/README.html b/src/add-ons/kernel/drivers/graphics/nvidia/README.html
index 31e878da76..971cea3cfd 100644
--- a/src/add-ons/kernel/drivers/graphics/nvidia/README.html
+++ b/src/add-ons/kernel/drivers/graphics/nvidia/README.html
@@ -44,7 +44,9 @@ You use this software at your own risk! Although I don't expect it to damage you
 <ul>
 	<li>If the driver does not load make sure you enabled 'assign IRQ to VGA card' in your system BIOS;
 	<li>If the driver still seems to create 'random' trouble make sure you have a fully functional VGA BIOS, or system BIOS for embedded cards (check for updates on the manufacturor's site). Make sure you mail me if you still have trouble but also if this version fixed that!
-	<li>If on a laptop the internal panel doesn't work when you connect an external monitor, make sure you set 'output device selection' to 'internal' (instead of 'auto') in the system BIOS if it has such an option. If you have this symptom on a normal card, or on a laptop without that BIOS option then you are probably out of luck for dualhead support.
+	<li>If on a laptop the internal panel doesn't work when you connect an external monitor, make sure you set 'output device selection' to 'internal' (instead of 'auto') in the system BIOS if it has such an option. If you have this symptom on a normal card, or on a laptop without that BIOS option then you are probably out of luck for dualhead support;
+	<li><strong>NV40 architecture cards:</strong> (GeForce 6200 and 6600 at least)<br>
+ 	Secondary analog monitor detection doesn't work and we can't control very well to which connector the card's output gets routed (lack of specs). This means you might have to experiment a bit with the way you connect your monitor to the card. A single analog or DVI screen should work OK, and two analog screens should be OK as well.
 </ul>
 <br>
 <hr>
@@ -186,6 +188,6 @@ With the <strong>pgm_panel true</strong> setting, the driver will fix your panel
 <hr>
 <br>
 <a href="mailto:info.be-hold@inter.nl.net">Rudolf Cornelissen.</a>
-<p>(Page last updated on February 13, 2005)</p>
+<p>(Page last updated on February 17, 2005)</p>
 </body>
 </html>
diff --git a/src/add-ons/kernel/drivers/graphics/nvidia/driver.c b/src/add-ons/kernel/drivers/graphics/nvidia/driver.c
index 7d8728e075..0bdf15ff12 100644
--- a/src/add-ons/kernel/drivers/graphics/nvidia/driver.c
+++ b/src/add-ons/kernel/drivers/graphics/nvidia/driver.c
@@ -606,6 +606,10 @@ static status_t map_device(device_info *di)
 
 	/* get ROM memory mapped base adress - this is defined in the PCI standard */
 	tmpUlong = get_pci(PCI_rom_base, 4);
+	//fixme?: if (!tmpUlong) try to map the ROM ourselves. Confirmed a PCIe system not
+	//having the ROM mapped on PCI and PCIe cards. Falling back to fetching from ISA
+	//legacy space will get us into trouble if we aren't the primary graphics card!!
+	//(as legacy space always has the primary card's ROM 'mapped'!)
 	if (tmpUlong)
 	{
 		/* ROM was assigned an adress, so enable ROM decoding - see PCI standard */