[Openchrome-devel] xf86-video-openchrome: 4 commits - configure.ac src/via_analog.c src/via_ums.h

[Kevin Brace]

 configure.ac     |    2 +-
 src/via_analog.c |   16 ++++++++--------
 src/via_ums.h    |   16 ++++++++++++++++
 3 files changed, 25 insertions(+), 9 deletions(-)

New commits:
commit 168e7ee7d803dfe4816f36cb616243e3c6397a92
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Sat Apr 8 00:21:03 2017 -0700

    Version bumped to 0.6.105
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/configure.ac b/configure.ac
index 74e0c40..15361e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-openchrome],
-        [0.6.104],
+        [0.6.105],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
         [xf86-video-openchrome])
 
commit 8c393176fd97c436f377b47f59ad2a5864f9ca79
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Sat Apr 8 00:18:57 2017 -0700

    Made changes to viaAnalogDisplaySource
    
    Also, corrected a mistake inside viaAnalogSetDisplaySource inline
    function.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_analog.c b/src/via_analog.c
index 7ff7f9f..c0ca6dc 100644
--- a/src/via_analog.c
+++ b/src/via_analog.c
@@ -63,18 +63,18 @@ viaAnalogOutput(ScrnInfoPtr pScrn, Bool outputState)
  * Specifies IGA1 or IGA2 for analog VGA DAC source.
  */
 static void
-viaAnalogDisplaySource(ScrnInfoPtr pScrn, CARD8 displaySource)
+viaAnalogDisplaySource(ScrnInfoPtr pScrn, int index)
 {
     vgaHWPtr hwp = VGAHWPTR(pScrn);
-    CARD8 value = displaySource;
+    CARD8 displaySource = index;
 
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
                         "Entered viaAnalogDisplaySource.\n"));
 
-    ViaSeqMask(hwp, 0x16, value << 6, 0x40);
+    viaAnalogSetDisplaySource(pScrn, displaySource & 0x01);
     xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-                "Analog VGA Display Output Source: IGA%d\n",
-                (value & 0x01) + 1);
+                "Analog (VGA) Display Source: IGA%d\n",
+                (displaySource & 0x01) + 1);
 
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
                         "Exiting viaAnalogDisplaySource.\n"));
@@ -239,7 +239,7 @@ via_analog_mode_set(xf86OutputPtr output, DisplayModePtr mode,
     if (output->crtc) {
         viaAnalogInit(pScrn);
         viaAnalogSyncPolarity(pScrn, mode->Flags);
-        viaAnalogDisplaySource(pScrn, iga->index ? 0x01 : 0x00);
+        viaAnalogDisplaySource(pScrn, iga->index);
     }
 
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
diff --git a/src/via_ums.h b/src/via_ums.h
index 56beed6..4d9c8b3 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -258,7 +258,7 @@ viaAnalogSetDisplaySource(ScrnInfoPtr pScrn, CARD8 displaySource)
     /* 3C5.16[6] - CRT Display Source
      *             0: Primary Display Stream (IGA1)
      *             1: Secondary Display Stream (IGA2) */
-    ViaSeqMask(VGAHWPTR(pScrn), displaySource << 6, BIT(6));
+    ViaSeqMask(VGAHWPTR(pScrn), 0x16, displaySource << 6, BIT(6));
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
                         "Analog (VGA) Display Source: IGA%d\n",
                         (displaySource & 0x01) + 1));
commit e7004203b9d1f9885b6da70d214342e252ce38b2
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Fri Apr 7 20:56:15 2017 -0700

    Added viaAnalogSetDisplaySource
    
    This inline function was added to via_ums.h.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_ums.h b/src/via_ums.h
index 78a12b6..56beed6 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -249,6 +249,22 @@ viaAnalogSetSyncPolarity(ScrnInfoPtr pScrn, CARD8 syncPolarity)
 }
 
 /*
+ * Sets analog (VGA) display source.
+ */
+static inline void
+viaAnalogSetDisplaySource(ScrnInfoPtr pScrn, CARD8 displaySource)
+{
+    /* Set analog (VGA) display source. */
+    /* 3C5.16[6] - CRT Display Source
+     *             0: Primary Display Stream (IGA1)
+     *             1: Secondary Display Stream (IGA2) */
+    ViaSeqMask(VGAHWPTR(pScrn), displaySource << 6, BIT(6));
+    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                        "Analog (VGA) Display Source: IGA%d\n",
+                        (displaySource & 0x01) + 1));
+}
+
+/*
  * Sets CX700 or later single chipset's LVDS1 power sequence type.
  */
 static inline void
commit d0b05c919c523cd08ee884f487aa83ba7a77bfb4
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Fri Apr 7 20:51:36 2017 -0700

    Rename viaAnalogSetDisplaySource as viaAnalogDisplaySource
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_analog.c b/src/via_analog.c
index b253c42..7ff7f9f 100644
--- a/src/via_analog.c
+++ b/src/via_analog.c
@@ -63,13 +63,13 @@ viaAnalogOutput(ScrnInfoPtr pScrn, Bool outputState)
  * Specifies IGA1 or IGA2 for analog VGA DAC source.
  */
 static void
-viaAnalogSetDisplaySource(ScrnInfoPtr pScrn, CARD8 displaySource)
+viaAnalogDisplaySource(ScrnInfoPtr pScrn, CARD8 displaySource)
 {
     vgaHWPtr hwp = VGAHWPTR(pScrn);
     CARD8 value = displaySource;
 
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-                        "Entered viaAnalogSetDisplaySource.\n"));
+                        "Entered viaAnalogDisplaySource.\n"));
 
     ViaSeqMask(hwp, 0x16, value << 6, 0x40);
     xf86DrvMsg(pScrn->scrnIndex, X_INFO,
@@ -77,7 +77,7 @@ viaAnalogSetDisplaySource(ScrnInfoPtr pScrn, CARD8 displaySource)
                 (value & 0x01) + 1);
 
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-                        "Exiting viaAnalogSetDisplaySource.\n"));
+                        "Exiting viaAnalogDisplaySource.\n"));
 }
 
 /*
@@ -239,7 +239,7 @@ via_analog_mode_set(xf86OutputPtr output, DisplayModePtr mode,
     if (output->crtc) {
         viaAnalogInit(pScrn);
         viaAnalogSyncPolarity(pScrn, mode->Flags);
-        viaAnalogSetDisplaySource(pScrn, iga->index ? 0x01 : 0x00);
+        viaAnalogDisplaySource(pScrn, iga->index ? 0x01 : 0x00);
     }
 
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,