[Openchrome-devel] xf86-video-openchrome: 3 commits - configure.ac src/via_display.c src/via_outputs.c

[Kevin Brace]

 configure.ac      |    2 +-
 src/via_display.c |   22 +++++++++++++++++-----
 src/via_outputs.c |    2 +-
 3 files changed, 19 insertions(+), 7 deletions(-)

New commits:
commit 639ce01f21e3292cbdb1d7a0ec0b2334a5ca975d
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Tue Jun 14 22:55:32 2016 -0500

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

diff --git a/configure.ac b/configure.ac
index c41f0c1..5dd0f8d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-openchrome],
-        [0.4.186],
+        [0.4.187],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
         [xf86-video-openchrome])
 
commit 1a12ce7882416f5d4156340f11a90bdb4fa0509a
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Tue Jun 14 22:52:50 2016 -0500

    Cleaning up the code that sets IGA1 line compare register
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_display.c b/src/via_display.c
index 912d6a4..ecc1093 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -1200,12 +1200,24 @@ viaIGA1SetDisplayRegister(ScrnInfoPtr pScrn, DisplayModePtr mode)
     ViaSeqMask(hwp, 0x1D, temp >> 8, 0x03);
 
 
-    /* line compare: We are not doing splitscreen so 0x3FFF */
-    hwp->writeCrtc(hwp, 0x18, 0xFF);
-    ViaCrtcMask(hwp, 0x07, 0x10, 0x10);
-    ViaCrtcMask(hwp, 0x09, 0x40, 0x40);
+    /* We are not using the split screen feature so line compare register
+     * should be set to 0x7FF. */
+    temp = 0x7FF;
+
+    /* 3X5.18[7:0] - Line Compare Bits [7:0] */
+    hwp->writeCrtc(hwp, 0x18, temp & 0xFF);
+
+    /* 3X5.07[4] - Line Compare Bit [8] */
+    ViaCrtcMask(hwp, 0x07, temp >> 4, 0x10);
+
+    /* 3X5.09[6] - Line Compare Bit [9] */
+    ViaCrtcMask(hwp, 0x09, temp >> 3, 0x40);
+
+    /* 3X5.35[4] - Line Compare Bit [10] */
+    ViaCrtcMask(hwp, 0x35, temp >> 6, 0x10);
+
+
     ViaCrtcMask(hwp, 0x33, 0x06, 0x07);
-    ViaCrtcMask(hwp, 0x35, 0x10, 0x10);
 
     /* zero Maximum scan line */
     ViaCrtcMask(hwp, 0x09, 0x00, 0x1F);
commit 91b0c7d7d5632eb29f0f72f99c675bf1120c5146
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Tue Jun 14 18:07:21 2016 -0500

    Fixing a switch statement within viaProbePinStrapping
    
    It was pointed out that the evaluated condition of one of the
    switch statement within viaProbePinStrapping function was flawed,
    and as a result, if a strict compilation option was used for
    compilation, the compiler will give out a compilation warning.
    
    Signed-off-by: Xavier Bachelot <xavier at bachelot.org>
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_outputs.c b/src/via_outputs.c
index 7e21e8c..fc6ddb5 100644
--- a/src/via_outputs.c
+++ b/src/via_outputs.c
@@ -1206,7 +1206,7 @@ viaProbePinStrapping(ScrnInfoPtr pScrn)
          *               01: DVI + LVDS2
          *               10: Dual LVDS Channel (High Resolution Panel)
          *               11: One DVI only (decrease the clock jitter) */
-        switch (sr13 && 0xC0) {
+        switch (sr13 & 0xC0) {
         case 0x00:
             xf86DrvMsg(pScrn->scrnIndex, X_INFO,
                         "LVDS1 + LVDS2 detected.\n");