Module Name: src
Committed By: jdc
Date: Mon May 9 09:06:28 UTC 2011
Modified Files:
src/sys/arch/sparc64/dev: ffb.c
Log Message:
Alter the sync-on-green and composite-sync settings:
if the monitor doesn't support composite sync, enable sync-on-green
then, if the monitor supports separate sync, disable composite vsync
(Prompted by macallan@.)
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/sparc64/dev/ffb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc64/dev/ffb.c
diff -u src/sys/arch/sparc64/dev/ffb.c:1.40 src/sys/arch/sparc64/dev/ffb.c:1.41
--- src/sys/arch/sparc64/dev/ffb.c:1.40 Wed Apr 20 09:57:59 2011
+++ src/sys/arch/sparc64/dev/ffb.c Mon May 9 09:06:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ffb.c,v 1.40 2011/04/20 09:57:59 martin Exp $ */
+/* $NetBSD: ffb.c,v 1.41 2011/05/09 09:06:28 jdc Exp $ */
/* $OpenBSD: creator.c,v 1.20 2002/07/30 19:48:15 jason Exp $ */
/*
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffb.c,v 1.40 2011/04/20 09:57:59 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffb.c,v 1.41 2011/05/09 09:06:28 jdc Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -1362,10 +1362,10 @@
}
}
#define EDID_VID_INP sc->sc_edid_info.edid_video_input
- if (!(EDID_VID_INP & EDID_VIDEO_INPUT_COMPOSITE_SYNC) &&
- (EDID_VID_INP & EDID_VIDEO_INPUT_SYNC_ON_GRN)) {
+ if (!(EDID_VID_INP & EDID_VIDEO_INPUT_COMPOSITE_SYNC)) {
dcl |= FFB_DAC_DAC_CTRL_SYNC_G;
- tgc |= FFB_DAC_TGC_VSYNC_DISABLE;
+ if (EDID_VID_INP & EDID_VIDEO_INPUT_SEPARATE_SYNCS)
+ tgc |= FFB_DAC_TGC_VSYNC_DISABLE;
}
if (EDID_VID_INP & EDID_VIDEO_INPUT_BLANK_TO_BLACK)
dcl |= FFB_DAC_DAC_CTRL_PED_ENABLE;
