From 9d7c686bac7715e0c5ee2df84cf26472a6a10853 Mon Sep 17 00:00:00 2001
From: Rudolf Cornelissen <rudolf.cornelissen@gmail.com>
Date: Thu, 6 Apr 2006 09:07:37 +0000
Subject: [PATCH] added new nv.setting called force_ws. Bumped version to 0.78.
 Note: 3D driver requires recompiling to be used now.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17028 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/add-ons/kernel/drivers/graphics/nvidia/README.html | 10 +++++++++-
 src/add-ons/kernel/drivers/graphics/nvidia/UPDATE.html |  3 ++-
 src/add-ons/kernel/drivers/graphics/nvidia/driver.c    |  4 +++-
 src/add-ons/kernel/drivers/graphics/nvidia/nv.settings |  1 +
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/add-ons/kernel/drivers/graphics/nvidia/README.html b/src/add-ons/kernel/drivers/graphics/nvidia/README.html
index d5366ea830..551fc323fe 100644
--- a/src/add-ons/kernel/drivers/graphics/nvidia/README.html
+++ b/src/add-ons/kernel/drivers/graphics/nvidia/README.html
@@ -32,6 +32,7 @@ You use this software at your own risk! Although I don't expect it to damage you
 <ul>
 	<li>Hardware cursor support (on both heads on dualhead cards);
 	<li>Full 2D acceleration;
+	<li>Basic 3D acceleration for older cards: see the seperately available 3D accelerant's documentation for details;
 	<li>Full BWindowScreen support (used for hardware pageflipping, scrolling/panning and acceleration in applications/games);
 	<li>DPMS support for both DVI and most laptop panels, and for analog connected screens (on both heads on dualhead cards), <strong>but not (yet?)</strong> for external DVI panels on laptops;
 	<li>B_YCbCr422 hardware overlay support on both TNT and GeForce series cards, <strong>except</strong> for GeForce 6200, 6600 and 7800. Overlay output 'follows head' in dualhead stretch/switch modes;
@@ -222,6 +223,13 @@ If you select <strong>force_sync false</strong> the driver's 3D accelerant will
 <ul>
 <li>Forcing vertical retrace synchronisation using the force_sync option 'overrules' retrace sync settings done in your applications: all applications will be synchronized to the vertical retrace events.
 </ul>
+	<li><strong>force_ws:</strong><br>
+This option (if enabled) overrules the aspect ratio detection for screens inside the driver. When set to <strong>true</strong> it forces all monitors to be treated as widescreen types.
+	<ul>
+		<li><strong>false:</strong> (default setting)<br>
+If you select <strong>force_ws false</strong> the driver will autodetect the screen's aspect ratio if it can, otherwise it will force 4:3 aspect. Screens that are connected with a DVI cable and screens inside a laptop are autodetected (according to the cardBIOS presets done), but analog connected screens will always make the driver block widescreen modes. Connected analog TV sets are always treated like widescreen devices though.
+		<li><strong>true:</strong> With this setting all monitors are treated as being widescreen types. This setting should only be used if you are having trouble using a widescreen monitor, because on non-widescreen monitors there's a (small) chance of destroying them if used with a widescreen mode. So use this setting with care.
+	</ul>
 <li><strong>primary:</strong> (set to disabled by default)<br>
 Primary lets you force a certain card to be used as primary card in your system if you have multiple graphics cards installed: so it will display your desktop. To enable this (hack) feature uncomment this item and fill in the exact name of the card that is to be primary (as exported by the kerneldriver in /dev/graphics/). If you are going to select a card other than the one displaying your system's POST messages at bootup, make sure you also set 'usebios false' as otherwise the card(s) aren't coldstarted by the driver.<br>
 <strong>Note please:</strong>
@@ -234,6 +242,6 @@ Primary lets you force a certain card to be used as primary card in your system
 <hr>
 <br>
 <a href="mailto:info.be-hold@inter.nl.net">Rudolf Cornelissen.</a>
-<p>(Page last updated on February 14, 2006)</p>
+<p>(Page last updated on April 6, 2006)</p>
 </body>
 </html>
diff --git a/src/add-ons/kernel/drivers/graphics/nvidia/UPDATE.html b/src/add-ons/kernel/drivers/graphics/nvidia/UPDATE.html
index 017da7efd4..a71318f9f3 100644
--- a/src/add-ons/kernel/drivers/graphics/nvidia/UPDATE.html
+++ b/src/add-ons/kernel/drivers/graphics/nvidia/UPDATE.html
@@ -4,11 +4,12 @@
 </head>
 <body>
 <p><h2>Changes done for each driverversion:</h2></p>
-<p><h1>head (0.77, Rudolf)</h1></p>
+<p><h1>head (0.78, Rudolf)</h1></p>
 <ul>
 <li>Improved 3D speed related initialisation programming for NV11 and NV15: NV11 just gained 44% rendering speed, NV15 gained 21% speed. The GeForce2Ti (NV15) is the new winner: Quake 2 timedemo 1 runs at 28.3fps in 1024x768x32 mode @ 75Hz refreshrate (P4 2.8Ghz, fsb 533Mhz, AGP4x), while on the GeForce4MX (NV18) it keeps running at 26.3fps. The GeForce2MX (NV11) now runs at 18.9fps.
 <li>Improved 3D speed related initialisation programming again. This time confirmed for NV11, NV15 and NV18 (so works on probably all NV1x cards): NV11 just gained another 43% rendering speed, NV15 gained another 60% speed, and NV18 gained 41% speed. The GeForce2Ti (NV15) is the definate winner: Quake 2 timedemo 1 runs at 45.4fps in 1024x768x32 mode @ 75Hz refreshrate (P4 2.8Ghz, fsb 533Mhz, AGP4x), while on the GeForce4MX (NV18) it now runs at 37.0fps. The GeForce2MX (NV11) now runs at 27.1fps.
 <li>Improved 3D speed related initialisation programming for TNT2 and TNT2-M64 card types, TNT1 speed remains unchanged. The speed improvement depends on colorspace and exact card type: there's a 1-4% gain. TNT2 runs Quake 2 timedemo 1 at about 17fps in 1024x768x32 mode @ 75Hz refreshrate, while TNT2-M64 is at 10.2fps (P4 2.8Ghz, fsb 533Mhz, AGP mode).
+<li>Added new nv.setting called 'force_ws' that forces all your connected screens to be treated as being widescreen types. This enables listing of the widescreen modes in most screen preference panels and the use of these modes. Only use this new option if appropriate of course, non-widescreen monitors might not like them!
 </ul>
 <p><h1>nv_driver 0.74 (Rudolf)</h1></p>
 <ul>
diff --git a/src/add-ons/kernel/drivers/graphics/nvidia/driver.c b/src/add-ons/kernel/drivers/graphics/nvidia/driver.c
index 86a785bfc6..36b67e5a26 100644
--- a/src/add-ons/kernel/drivers/graphics/nvidia/driver.c
+++ b/src/add-ons/kernel/drivers/graphics/nvidia/driver.c
@@ -4,7 +4,7 @@
 
 	Other authors:
 	Mark Watson;
-	Rudolf Cornelissen 3/2002-3/2006.
+	Rudolf Cornelissen 3/2002-4/2006.
 */
 
 /* standard kernel driver stuff */
@@ -369,6 +369,7 @@ static nv_settings current_settings = { // see comments in nv.settings
 	true,					// dma_acc
 	false,					// vga_on_tv
 	false,					// force_sync
+	false,					// force_ws
 	0,						// gpu_clk
 	0,						// ram_clk
 };
@@ -572,6 +573,7 @@ init_driver(void) {
 		current_settings.dma_acc = get_driver_boolean_parameter (settings_handle, "dma_acc", false, false);
 		current_settings.vga_on_tv = get_driver_boolean_parameter (settings_handle, "vga_on_tv", false, false);
 		current_settings.force_sync = get_driver_boolean_parameter (settings_handle, "force_sync", false, false);
+		current_settings.force_ws = get_driver_boolean_parameter (settings_handle, "force_ws", false, false);
 
 		item = get_driver_parameter (settings_handle, "gpu_clk", "0", "0");
 		value = strtoul (item, &end, 0);
diff --git a/src/add-ons/kernel/drivers/graphics/nvidia/nv.settings b/src/add-ons/kernel/drivers/graphics/nvidia/nv.settings
index 34242e86e7..968304416e 100644
--- a/src/add-ons/kernel/drivers/graphics/nvidia/nv.settings
+++ b/src/add-ons/kernel/drivers/graphics/nvidia/nv.settings
@@ -21,6 +21,7 @@ force_pci	false			# block AGP mode use if true (AGP cards only)
 dma_acc	true			# if true enable DMA cmd fetching for 2D acc (instead of using PIO)
 #tv_output	0			# disabled or 0 = autodetect, 1 = Y/C (and CVBS if possible), 2 = CVBS
 force_sync	false			# if true forces 3D rendering to be synchronized to the vertical retrace
+force_ws	false			# if true forces widescreen type detection for all connected screens
 
 # WARNING: tweak alert! modify stuff below on your own risk...
 unhide_fw	false			# if true 'unhide' cards AGP fastwrite support on cards that hide it