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

[Kevin Brace]

 configure.ac  |    2 -
 src/via_fp.c  |   63 ++++++++++++++++++----------------------------------------
 src/via_ums.h |    7 ++----
 3 files changed, 24 insertions(+), 48 deletions(-)

New commits:
commit e0c93afbe6cc667d795f2b0e070ff1f48cd36a4c
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Fri Jun 2 22:08:51 2017 -0700

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

diff --git a/configure.ac b/configure.ac
index 90d4eac..8c5d40a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-openchrome],
-        [0.6.126],
+        [0.6.127],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
         [xf86-video-openchrome])
 
commit f75efa861db4d749e945f96f08c073055dd773de
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Fri Jun 2 22:08:02 2017 -0700

    Major update to viaFPDisplaySource
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_fp.c b/src/via_fp.c
index 25419b0..ae6ec1f 100644
--- a/src/via_fp.c
+++ b/src/via_fp.c
@@ -601,64 +601,41 @@ viaFPIOPadSetting(ScrnInfoPtr pScrn, Bool ioPadOn)
 }
 
 static void
-viaFPDisplaySource(ScrnInfoPtr pScrn, int index)
+viaFPDisplaySource(ScrnInfoPtr pScrn, int index, CARD8 diPort)
 {
-    vgaHWPtr hwp = VGAHWPTR(pScrn);
-    VIAPtr pVia = VIAPTR(pScrn);
-    CARD8 sr12, sr13;
     CARD8 displaySource = index & 0x01;
 
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
                         "Entered viaFPDisplaySource.\n"));
 
-    sr12 = hwp->readSeq(hwp, 0x12);
-    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-                        "SR12: 0x%02X\n", sr12));
-    sr13 = hwp->readSeq(hwp, 0x13);
-    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-                        "SR13: 0x%02X\n", sr13));
-
-    switch (pVia->Chipset) {
-    case VIA_KM400:
-    case VIA_K8M800:
-    case VIA_PM800:
-    case VIA_P4M800PRO:
-        /* 3C5.12[4] - DVP0D4 pin strapping
-         *             0: 12-bit flat panel interface
-         *             1: 24-bit flat panel interface */
-        if (sr12 & 0x10) {
-            viaDFPHighSetDisplaySource(pScrn, displaySource);
-            viaDFPLowSetDisplaySource(pScrn, displaySource);
-        }
-
-        break;
-    case VIA_P4M890:
-    case VIA_K8M890:
-    case VIA_P4M900:
-        /* 3C5.12[4] - DVP0D4 pin strapping
-         *             0: 12-bit flat panel interface
-         *             1: 24-bit flat panel interface */
-        if (sr12 & 0x10) {
-            viaDFPHighSetDisplaySource(pScrn, displaySource);
-        }
-
+    switch(diPort) {
+    case VIA_DI_PORT_FPDPLOW:
         viaDFPLowSetDisplaySource(pScrn, displaySource);
         viaDVP1SetDisplaySource(pScrn, displaySource);
         break;
-    case VIA_CX700:
-    case VIA_VX800:
-        /* The code will be reworked later. */
+    case VIA_DI_PORT_FPDPHIGH:
+        viaDFPHighSetDisplaySource(pScrn, displaySource);
+        viaDVP0SetDisplaySource(pScrn, displaySource);
+        break;
+    case (VIA_DI_PORT_FPDPLOW |
+          VIA_DI_PORT_FPDPHIGH):
+        viaDFPLowSetDisplaySource(pScrn, displaySource);
+        viaDFPHighSetDisplaySource(pScrn, displaySource);
+        break;
+    case VIA_DI_PORT_LVDS1:
+        viaLVDS1SetDisplaySource(pScrn, displaySource);
+        break;
+    case VIA_DI_PORT_LVDS2:
         viaLVDS2SetDisplaySource(pScrn, displaySource);
         break;
-    case VIA_VX855:
-    case VIA_VX900:
+    case (VIA_DI_PORT_LVDS1 |
+          VIA_DI_PORT_LVDS2):
         viaLVDS1SetDisplaySource(pScrn, displaySource);
+        viaLVDS2SetDisplaySource(pScrn, displaySource);
         break;
     default:
         break;
-
     }
-
     xf86DrvMsg(pScrn->scrnIndex, X_INFO,
                 "FP Display Source: IGA%d\n",
                 displaySource + 1);
@@ -1330,7 +1307,7 @@ via_fp_mode_set(xf86OutputPtr output, DisplayModePtr mode,
             break;
         }
 
-        viaFPDisplaySource(pScrn, iga->index);
+        viaFPDisplaySource(pScrn, iga->index, pVIAFP->diPort);
 
         switch (pVia->Chipset) {
         case VIA_CX700:
diff --git a/src/via_ums.h b/src/via_ums.h
index 894c3ff..f9a6659 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -124,11 +124,10 @@
 #define     VIA_DI_PORT_DIP1        0x2
 #define     VIA_DI_PORT_DVP1        0x2
 #define     VIA_DI_PORT_FPDPLOW     0x4
-#define     VIA_DI_PORT_DVP2        0x4
-#define     VIA_DI_PORT_LVDS1       0x4
-#define     VIA_DI_PORT_TMDS        0x4
 #define     VIA_DI_PORT_FPDPHIGH    0x8
-#define     VIA_DI_PORT_LVDS2       0x8
+#define     VIA_DI_PORT_LVDS1       0x10
+#define     VIA_DI_PORT_TMDS        0x10
+#define     VIA_DI_PORT_LVDS2       0x20
 
 /* External TMDS (DVI) Transmitter Type */
 #define     VIA_TMDS_NONE           0x0