From 37bf6a6a6ee57c5a6219be42a6f633f2bdb9cbc5 Mon Sep 17 00:00:00 2001
From: Rudolf Cornelissen <rudolf.cornelissen@gmail.com>
Date: Tue, 23 Oct 2007 18:55:52 +0000
Subject: [PATCH] disabled acceleration engine init and exporting the hooks on
 G80 and above for now.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22684 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/add-ons/accelerants/nvidia/SetDisplayMode.c    | 6 +++++-
 src/add-ons/accelerants/nvidia/engine/nv_general.c | 7 ++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/add-ons/accelerants/nvidia/SetDisplayMode.c b/src/add-ons/accelerants/nvidia/SetDisplayMode.c
index 76c2863032..14197bf92d 100644
--- a/src/add-ons/accelerants/nvidia/SetDisplayMode.c
+++ b/src/add-ons/accelerants/nvidia/SetDisplayMode.c
@@ -6,7 +6,7 @@
 	Other authors:
 	Mark Watson,
 	Apsed,
-	Rudolf Cornelissen 11/2002-2/2006
+	Rudolf Cornelissen 11/2002-10/2007
 */
 
 #define MODULE_BIT 0x00200000
@@ -292,10 +292,14 @@ status_t SET_DISPLAY_MODE(display_mode *mode_to_set)
 	/* note:
 	 * Maybe later we can forget about non-DMA mode (depends on 3D acceleration
 	 * attempts). */
+//no acc support for G8x yet!
+if (si->ps.card_arch < NV50A)
+{
 	if (!si->settings.dma_acc)
 		nv_acc_init();
 	else
 		nv_acc_init_dma();
+}
 	/* set up overlay unit for this mode */
 	nv_bes_init();
 
diff --git a/src/add-ons/accelerants/nvidia/engine/nv_general.c b/src/add-ons/accelerants/nvidia/engine/nv_general.c
index 2aa0397d20..4b9fe8f96a 100644
--- a/src/add-ons/accelerants/nvidia/engine/nv_general.c
+++ b/src/add-ons/accelerants/nvidia/engine/nv_general.c
@@ -1,7 +1,7 @@
 /* Authors:
    Mark Watson 12/1999,
    Apsed,
-   Rudolf Cornelissen 10/2002-9/2007
+   Rudolf Cornelissen 10/2002-10/2007
 */
 
 #define MODULE_BIT 0x00008000
@@ -1951,6 +1951,9 @@ status_t nv_general_validate_pic_size (display_mode *target, uint32 *bytes_per_r
 	{
 		/* check if we can setup this mode with acceleration */
 		*acc_mode = true;
+		//no acc support for G8x yet!
+		if (si->ps.card_arch >= NV50A) *acc_mode = false;
+
 		/* virtual_width */
 		if (target->virtual_width > max_acc_width) *acc_mode = false;
 		/* virtual_height */
@@ -1983,6 +1986,8 @@ status_t nv_general_validate_pic_size (display_mode *target, uint32 *bytes_per_r
 	{
 		/* check if we can setup this mode with acceleration */
 		*acc_mode = true;
+		//no acc support for G8x yet!
+		if (si->ps.card_arch >= NV50A) *acc_mode = false;
 		/* (we already know virtual_width will be no problem) */
 		/* virtual_height */
 		/* (NV cards can even do more than this(?)...