From 6de3877ad508c67944e5e472d4126d2750e59c59 Mon Sep 17 00:00:00 2001
From: Rudolf Cornelissen <rudolf.cornelissen@gmail.com>
Date: Tue, 25 Oct 2005 13:54:43 +0000
Subject: [PATCH] fixed dma_acc setting fault I introduced when adding
 vga_on_tv. Updated docs for a part.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14516 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/add-ons/kernel/drivers/graphics/nvidia/UPDATE.html | 5 +++--
 src/add-ons/kernel/drivers/graphics/nvidia/driver.c    | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/add-ons/kernel/drivers/graphics/nvidia/UPDATE.html b/src/add-ons/kernel/drivers/graphics/nvidia/UPDATE.html
index 6895f53c38..782aedf7c2 100644
--- a/src/add-ons/kernel/drivers/graphics/nvidia/UPDATE.html
+++ b/src/add-ons/kernel/drivers/graphics/nvidia/UPDATE.html
@@ -4,13 +4,14 @@
 </head>
 <body>
 <p><h2>Changes done for each driverversion:</h2></p>
-<p><h1>head (SVN 0.58, Rudolf)</h1></p>
+<p><h1>head (SVN 0.59, Rudolf)</h1></p>
 <ul>
 <li>Added capability to driver to run without an INT assigned. Driver will now automatically disable the 'Sync_to_Retrace' function if no INT was assigned instead of not loading/running at all; 
 <li>Fixed PLL reference recognition (used for refreshrate calculations) and dualhead detection for a number of 'newer' cards: most notably for a lot of GeForce 6200 types! Code is rewritten so it's much less breakable when new cards are added to the supported list in the future;
 <li>Added TVout support for Brooktree BT868/BT869 and Conexant CX25870/CX25871 TV encoders: NTSC and PAL 640x480 and 800x600 Desktop modes are supported, NTSC VCD 640x480 and DVD 720x480 Video modes are supported, PAL VCD 768x576 and DVD 720x576 Video modes are supported. Singlehead cards should work perfectly while dualhead cards only display a testimage on TV in all modes for now. Still in progress...
 <li>Added 'force TV output signal type' (called tv_output) to nv.settings: Now you can select Y/C or CVBS output manually in case autodetection fails for your TVset. That might happen in case the TV manufacturor didn't adhere to the impedance specs that exist for these signals;
-<li>Added detection for two new cards: Geforce 7800 GT PCIe (ID 0x0092) and Geforce 7800 GTX Go PCIe (ID 0x0099). Note please that these cards have not been tested yet, and acceleration for these cards is currently disabled.
+<li>Added detection for two new cards: Geforce 7800 GT PCIe (ID 0x0092) and Geforce 7800 GTX Go PCIe (ID 0x0099). Note please that these cards have not been tested yet, and acceleration for these cards is currently disabled;
+<li>Added 'force VGA output ON while TVout enabled' (called 'vga_on_tv') to nv.settings: Now the VGA screen is disabled by default for a head outputting to TV. You can turn it on using this new preset setting. Note though: doing that is considered a tweak which might damage your VGA screen (if it's an old one)."
 </ul>
 <p><h1>nv_driver 0.53 (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 2b2232838f..d8676f3676 100644
--- a/src/add-ons/kernel/drivers/graphics/nvidia/driver.c
+++ b/src/add-ons/kernel/drivers/graphics/nvidia/driver.c
@@ -492,7 +492,7 @@ init_driver(void) {
 		current_settings.unhide_fw = get_driver_boolean_parameter (settings_handle, "unhide_fw", false, false);
 		current_settings.pgm_panel = get_driver_boolean_parameter (settings_handle, "pgm_panel", false, false);
 		current_settings.dma_acc = get_driver_boolean_parameter (settings_handle, "dma_acc", false, false);
-		current_settings.dma_acc = get_driver_boolean_parameter (settings_handle, "vga_on_tv", false, false);
+		current_settings.vga_on_tv = get_driver_boolean_parameter (settings_handle, "vga_on_tv", false, false);
 
 		unload_driver_settings (settings_handle);
 	}
