From 48566405f6f8ef03cc43a732849abd84d23705af Mon Sep 17 00:00:00 2001
From: Rudolf Cornelissen <rudolf.cornelissen@gmail.com>
Date: Sun, 14 May 2006 16:09:26 +0000
Subject: [PATCH] fixed distortions on VGA output after TVout use (G100/G200).

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17455 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/add-ons/accelerants/matrox/SetDisplayMode.c   |  2 +-
 src/add-ons/accelerants/matrox/engine/mga_maven.c | 14 ++++++++------
 src/add-ons/accelerants/matrox/engine/mga_proto.h |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/add-ons/accelerants/matrox/SetDisplayMode.c b/src/add-ons/accelerants/matrox/SetDisplayMode.c
index 8f81b22690..6e73b0b467 100644
--- a/src/add-ons/accelerants/matrox/SetDisplayMode.c
+++ b/src/add-ons/accelerants/matrox/SetDisplayMode.c
@@ -396,7 +396,7 @@ status_t SET_DISPLAY_MODE(display_mode *mode_to_set)
 		}
 		else
 		{
-			gx00_maven_shutoff_vid_pll();
+			gx00_maven_shutoff();
 			gx00_crtc_set_timing(target);
 		}
 	}
diff --git a/src/add-ons/accelerants/matrox/engine/mga_maven.c b/src/add-ons/accelerants/matrox/engine/mga_maven.c
index bd101ad5eb..1fe3d2caee 100644
--- a/src/add-ons/accelerants/matrox/engine/mga_maven.c
+++ b/src/add-ons/accelerants/matrox/engine/mga_maven.c
@@ -101,7 +101,6 @@ status_t gx00_maven_dpms(bool display, bool h, bool v)
 	{
 		/* turn off screen using a few methods! */
 		MAVW(STABLE, 0x6a);
-//		MAVW(TEST, 0x03);
 		MAVW(OUTMODE, 0x00);
 	}
 
@@ -226,16 +225,19 @@ status_t gx00_maven_mode(int mode,float brightness)
 	return B_OK;
 }
 
-void gx00_maven_shutoff_vid_pll()
+void gx00_maven_shutoff()
 {
 	switch (si->ps.card_type)
 	{
 		case G100:
 		case G200:
-		case G400:
-		case G400MAX:
-//unfortunately doesn't work as expected :-/
-//			MAVW(PIXPLLP, ((MAVR(PIXPLLP)) & ~0x80));
+		//fixme: see if this works on G400 too:
+		//case G400:
+		//case G400MAX:
+			/* prevents distortions on CRTC1... */
+			MAVW(TEST, 0x03);
+			MAVW(MONEN, 0x00);
+			MAVW(MONSET, 0x00);
 			break;
 		default:
 			break;
diff --git a/src/add-ons/accelerants/matrox/engine/mga_proto.h b/src/add-ons/accelerants/matrox/engine/mga_proto.h
index a7482073d3..baf102560e 100644
--- a/src/add-ons/accelerants/matrox/engine/mga_proto.h
+++ b/src/add-ons/accelerants/matrox/engine/mga_proto.h
@@ -70,7 +70,7 @@ status_t g100_g400max_maven_vid_pll_find(display_mode target,float * calc_pclk,
 				uint8 * m_result,uint8 * n_result,uint8 * p_result);
 status_t g450_g550_maven_vid_pll_find(display_mode target,float * calc_pclk,
 				uint8 * m_result,uint8 * n_result,uint8 * p_result, uint8 test);
-void gx00_maven_shutoff_vid_pll(void);
+void gx00_maven_shutoff(void);
 status_t gx00_maven_set_vid_pll(display_mode target);
 
 /*MAVENTV functions*/