[src/trunk]: src/sys/arch/sparc64/dev Alter the sync-on-green and composite-s...

[jdc <jdc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/37d3d7844df2
branches:  trunk
changeset: 764852:37d3d7844df2
user:      jdc <jdc%NetBSD.org@localhost>
date:      Mon May 09 09:06:28 2011 +0000

description:
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@.)

diffstat:

 sys/arch/sparc64/dev/ffb.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (32 lines):

diff -r 94ec3a69f723 -r 37d3d7844df2 sys/arch/sparc64/dev/ffb.c
--- a/sys/arch/sparc64/dev/ffb.c        Mon May 09 09:06:21 2011 +0000
+++ b/sys/arch/sparc64/dev/ffb.c        Mon May 09 09:06:28 2011 +0000
@@ -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;