patch-2.4.0-prerelease linux/drivers/video/matrox/matroxfb_crtc2.c

• Lines: 18
• Date: Fri Dec 29 14:07:23 2000
• Orig file: v2.4.0-test12/linux/drivers/video/matrox/matroxfb_crtc2.c
• Orig date: Tue Aug 29 14:09:15 2000

diff -u --recursive --new-file v2.4.0-test12/linux/drivers/video/matrox/matroxfb_crtc2.c linux/drivers/video/matrox/matroxfb_crtc2.c
@@ -104,9 +104,14 @@
 		tmp |= 0x00000001;	/* enable CRTC2 */
 
 		if (ACCESS_FBINFO(output.sh) & MATROXFB_OUTPUT_CONN_SECONDARY) {
-			tmp |= 0x00000002; /* source from VDOCLK */
-			tmp |= 0xC0000000; /* enable vvidrst & hvidrst */
-			/* MGA TVO is our clock source */
+			if (ACCESS_FBINFO(devflags.g450dac)) {
+				tmp |= 0x00000006; /* source from secondary pixel PLL */
+				/* no vidrst */
+			} else {
+				tmp |= 0x00000002; /* source from VDOCLK */
+				tmp |= 0xC0000000; /* enable vvidrst & hvidrst */
+				/* MGA TVO is our clock source */
+			}
 		} else if (ACCESS_FBINFO(output.sh) & MATROXFB_OUTPUT_CONN_PRIMARY) {
 			tmp |= 0x00000004; /* source from pixclock */
 			/* PIXPLL is our clock source */