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

[Kevin Brace]

 configure.ac      |    2 +-
 src/via_analog.c  |    2 +-
 src/via_display.c |   26 +-------------------------
 src/via_tmds.c    |    2 +-
 src/via_ums.h     |   16 ++++++++++++++++
 5 files changed, 20 insertions(+), 28 deletions(-)

New commits:
commit fd7cec1dfab6a20fd00c8ad18cdc33b451a95953
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Sat Jul 15 23:28:36 2017 -0500

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

diff --git a/configure.ac b/configure.ac
index d51dc4d..d5c5c9a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-openchrome],
-        [0.6.153],
+        [0.6.154],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
         [xf86-video-openchrome])
 
commit 7d88fc3cac76810c4fb720397abccd1199c93864
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Sat Jul 15 23:27:49 2017 -0500

    Fix for not setting VSYNC sync polarity correctly
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_analog.c b/src/via_analog.c
index b1cb31d..7394e66 100644
--- a/src/via_analog.c
+++ b/src/via_analog.c
@@ -74,7 +74,7 @@ viaAnalogSyncPolarity(ScrnInfoPtr pScrn, unsigned int flags)
         syncPolarity |= BIT(0);
     }
 
-    if (flags & V_NHSYNC) {
+    if (flags & V_NVSYNC) {
         syncPolarity |= BIT(1);
     }
 
diff --git a/src/via_tmds.c b/src/via_tmds.c
index 886f52f..8074910 100644
--- a/src/via_tmds.c
+++ b/src/via_tmds.c
@@ -59,7 +59,7 @@ viaTMDSSyncPolarity(ScrnInfoPtr pScrn, unsigned int flags)
         syncPolarity |= BIT(0);
     }
 
-    if (flags & V_NHSYNC) {
+    if (flags & V_NVSYNC) {
         syncPolarity |= BIT(1);
     }
 
commit c27fe5d38b1567c2a84834136a4d23b96603a391
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Sat Jul 15 22:21:21 2017 -0500

    Converted viaIGA1SetPaletteLUTResolution into an inline function
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_display.c b/src/via_display.c
index 29114b2..35c413b 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -162,30 +162,6 @@ viaIGA1SetColorDepth(ScrnInfoPtr pScrn, CARD8 bitsPerPixel)
 }
 
 /*
- * Sets IGA1 palette LUT resolution. (6-bit or 8-bit)
- */
-static void
-viaIGA1SetPaletteLUTResolution(ScrnInfoPtr pScrn, CARD8 paletteLUT)
-{
-    vgaHWPtr hwp = VGAHWPTR(pScrn);
-
-    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-                        "Entered viaIGA1SetPaletteLUTResolution.\n"));
-
-    /* Set the palette LUT resolution for IGA1. */
-    /* 3C5.15[7] - IGA1 6 / 8 Bit LUT
-     *             0: 6-bit
-     *             1: 8-bit */
-    ViaSeqMask(hwp, 0x15, paletteLUT << 7, 0x80);
-    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-                "IGA1 Palette LUT Resolution: %s bit\n",
-                (paletteLUT & 0x01) ? "8" : "6");
-
-    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-                        "Exiting viaIGA1SetPaletteLUTResolution.\n"));
-}
-
-/*
  * Controls IGA1 gamma correction state.
  */
 static void
@@ -3788,7 +3764,7 @@ iga1_crtc_gamma_set(xf86CrtcPtr crtc, CARD16 *red, CARD16 *green, CARD16 *blue,
     }
 
     /* Set palette LUT to 8-bit mode. */
-    viaIGA1SetPaletteLUTResolution(pScrn, 0x01);
+    viaIGA1SetPaletteLUTResolution(pScrn, TRUE);
 
     switch (pScrn->bitsPerPixel) {
     case 8:
diff --git a/src/via_ums.h b/src/via_ums.h
index 18803b8..de2f4d1 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -309,6 +309,22 @@ viaIGA1HWReset(ScrnInfoPtr pScrn, Bool resetState)
 }
 
 /*
+ * Sets IGA1 palette LUT resolution. (6-bit or 8-bit)
+ */
+static inline void
+viaIGA1SetPaletteLUTResolution(ScrnInfoPtr pScrn, Bool paletteLUT)
+{
+    /* 3C5.15[7] - IGA1 6 / 8 Bit LUT
+     *             0: 6-bit
+     *             1: 8-bit */
+    ViaSeqMask(VGAHWPTR(pScrn), 0x15,
+                paletteLUT ? BIT(7) : 0x00, BIT(7));
+    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                        "IGA1 Palette LUT Resolution: %s bit\n",
+                        paletteLUT ? "8" : "6"));
+}
+
+/*
  * Sets IGA1 display output state.
  */
 static inline void