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

[Kevin Brace]

 configure.ac      |    2 +-
 src/via_display.c |    3 ---
 src/via_lvds.c    |   41 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 4 deletions(-)

New commits:
commit 9214825f893a4e9eccca0d31481962fe34691331
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Mon Aug 8 00:30:04 2016 -0700

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

diff --git a/configure.ac b/configure.ac
index 1d79815..fda88ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-openchrome],
-        [0.5.122],
+        [0.5.123],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
         [xf86-video-openchrome])
 
commit 894df6c83b5aa103d0806b6f9c42abc782ff0d7c
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Mon Aug 8 00:07:18 2016 -0700

    Set DFP Low display output source from via_lvds_mode_set
    
    Rather than setting DFP (Digital Flat Panel) Low display output
    source from viaIGA2SetDisplayRegister function inside via_display.c,
    it will now be set from via_lvds_mode_set callback function inside
    via_lvds.c.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_display.c b/src/via_display.c
index 8db908b..bf6bf9d 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -2154,9 +2154,6 @@ viaIGA2SetDisplayRegister(ScrnInfoPtr pScrn, DisplayModePtr mode)
      * (Power Management Status). */
     ViaSeqMask(hwp, 0x2A, 0x0F, 0x0F);
 
-    /* IGA2 for DFP Low. */
-    ViaCrtcMask(hwp, 0x99, 0x10, 0x10);
-
     /* Use IGA2 for DVP1 Data Source Selection 0. */
     ViaCrtcMask(hwp, 0x9B, 0x10, 0x10);
 
diff --git a/src/via_lvds.c b/src/via_lvds.c
index 5a44eaa..480d3df 100644
--- a/src/via_lvds.c
+++ b/src/via_lvds.c
@@ -938,6 +938,21 @@ via_lvds_mode_set(xf86OutputPtr output, DisplayModePtr mode,
         case VIA_P4M900:
             viaDFPLowSetDelayTap(pScrn, 0x08);
             break;
+        default:
+            break;
+        }
+
+
+        switch (pVia->Chipset) {
+        case VIA_KM400:
+        case VIA_K8M800:
+        case VIA_PM800:
+        case VIA_P4M800PRO:
+        case VIA_P4M890:
+        case VIA_K8M890:
+        case VIA_P4M900:
+            viaDFPLowSetDisplaySource(pScrn, iga->index ? 0x01 : 0x00);
+            break;
         case VIA_CX700:
         case VIA_VX800:
         case VIA_VX855:
commit 1acc709791b28d2eee794e261a37e55e3c94b756
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Sun Aug 7 23:51:13 2016 -0700

    Added viaDFPLowSetDisplaySource
    
    viaDFPLowSetDisplaySource function sets the display output source
    for DFP (Digital Flat Panel) Low interface. This function is located
    inside via_lvds.c.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_lvds.c b/src/via_lvds.c
index c198cf9..5a44eaa 100644
--- a/src/via_lvds.c
+++ b/src/via_lvds.c
@@ -154,6 +154,32 @@ viaLVDS2SetDisplaySource(ScrnInfoPtr pScrn, CARD8 displaySource)
 }
 
 /*
+ * Sets IGA1 or IGA2 as the display output source for VIA Technologies
+ * Chrome IGP DFP (Digital Flat Panel) Low interface.
+ */
+static void
+viaDFPLowSetDisplaySource(ScrnInfoPtr pScrn, CARD8 displaySource)
+{
+    vgaHWPtr hwp = VGAHWPTR(pScrn);
+    CARD8 temp = displaySource;
+
+    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                        "Entered viaDFPLowSetDisplaySource.\n"));
+
+    /* Set DFP Low display output source.
+    /* 3X5.99[4] - DFP Low Data Source Selection
+     *             0: Primary Display
+     *             1: Secondary Display */
+    ViaCrtcMask(hwp, 0x99, temp << 4, 0x10);
+    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                "DFP Low Display Output Source: IGA%d\n",
+                (temp & 0x01) + 1);
+
+    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                        "Exiting viaDFPLowSetDisplaySource.\n"));
+}
+
+/*
  * Sets DFP (Digital Flat Panel) Low interface delay tap.
  */
 static void