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

Kevin Brace kevinbrace at kemper.freedesktop.org
Wed Apr 19 22:50:56 UTC 2017


 configure.ac   |    2 -
 src/via_tmds.c |   28 +++++----------
 src/via_ums.h  |  103 ++++++++++++++++++++++++++++++++++-----------------------
 3 files changed, 73 insertions(+), 60 deletions(-)

New commits:
commit f7f520908700bc4ea04d96abeddcf410bf4da442
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Wed Apr 19 15:50:38 2017 -0700

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

diff --git a/configure.ac b/configure.ac
index bf6cc2e..76637fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-openchrome],
-        [0.6.107],
+        [0.6.108],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
         [xf86-video-openchrome])
 
commit 091c47746833564f17d90ef5e7d7710a49cc7ed0
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Tue Apr 11 01:05:19 2017 -0700

    Changed input parameters for viaTMDSDisplaySource
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_tmds.c b/src/via_tmds.c
index 935b22c..0c1b695 100644
--- a/src/via_tmds.c
+++ b/src/via_tmds.c
@@ -134,28 +134,20 @@ viaTMDSSyncPolarity(ScrnInfoPtr pScrn, unsigned int flags)
 }
 
 /*
- * Sets IGA1 or IGA2 as the display output source for VIA Technologies IGP
- * integrated TMDS transmitter.
+ * Sets TMDS (DVI) display source.
  */
 static void
-viaTMDSDisplaySource(ScrnInfoPtr pScrn, CARD8 displaySource)
+viaTMDSDisplaySource(ScrnInfoPtr pScrn, int index)
 {
-    vgaHWPtr hwp = VGAHWPTR(pScrn);
-    CARD8 temp = displaySource;
+    CARD8 displaySource = index;
 
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
                         "Entered viaTMDSDisplaySource.\n"));
 
-    /* Set integrated TMDS transmitter display output source.
-     * The integrated TMDS transmitter appears to utilize LVDS1's data
-     * source selection bit (3X5.99[4]). */
-    /* 3X5.99[4] - LVDS Channel1 Data Source Selection
-     *             0: Primary Display
-     *             1: Secondary Display */
-    ViaCrtcMask(hwp, 0x99, temp << 4, 0x10);
+    viaTMDSSetDisplaySource(pScrn, displaySource & 0x01);
     xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-                "Integrated TMDS Transmitter Display Output Source: IGA%d\n",
-                (temp & 0x01) + 1);
+                "TMDS (DVI) Display Source: IGA%d\n",
+                (displaySource & 0x01) + 1);
 
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
                         "Exiting viaTMDSDisplaySource.\n"));
@@ -894,7 +886,7 @@ via_tmds_mode_set(xf86OutputPtr output, DisplayModePtr mode,
         /* Set integrated TMDS transmitter sync polarity. */
         viaTMDSSyncPolarity(pScrn, adjusted_mode->Flags);
 
-        viaTMDSDisplaySource(pScrn, iga->index ? 0x01 : 0x00);
+        viaTMDSDisplaySource(pScrn, iga->index);
     }
 
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
commit 05150b6a030333b07909e2e96c55fa455a9a95ad
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Tue Apr 11 00:55:53 2017 -0700

    Changed the comment type used for inline functions inside 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 0c4dde3..91d652f 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -230,9 +230,9 @@ viaAnalogSetDACOutput(ScrnInfoPtr pScrn, Bool outputState)
      *             1: DAC off */
     ViaCrtcMask(VGAHWPTR(pScrn), 0x47, outputState ? 0x00 : BIT(2),
                 BIT(2));
-    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-                "Analog (VGA) DAC Output: %s\n",
-                outputState ? "On" : "Off");
+    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                        "Analog (VGA) DAC Output: %s\n",
+                        outputState ? "On" : "Off"));
 }
 
 static inline void
@@ -250,11 +250,11 @@ viaAnalogSetSyncPolarity(ScrnInfoPtr pScrn, CARD8 syncPolarity)
                 & ~((BIT(1) | BIT(0)) << 6))
             | ((syncPolarity & (BIT(1) | BIT(0))) << 6));
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-                "Analog (VGA) Horizontal Sync Polarity: %s\n",
-                (syncPolarity & BIT(0)) ? "-" : "+"));
+                        "Analog (VGA) Horizontal Sync Polarity: %s\n",
+                        (syncPolarity & BIT(0)) ? "-" : "+"));
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-                "Analog (VGA) Vertical Sync Polarity: %s\n",
-                (syncPolarity & BIT(1)) ? "-" : "+"));
+                        "Analog (VGA) Vertical Sync Polarity: %s\n",
+                        (syncPolarity & BIT(1)) ? "-" : "+"));
 }
 
 /*
@@ -285,9 +285,9 @@ viaLVDS1SetPowerSeq(ScrnInfoPtr pScrn, Bool ctrlType)
      *             1: Software Control */
     ViaCrtcMask(VGAHWPTR(pScrn), 0x91, ctrlType ? BIT(0) : 0x00,
                 BIT(0));
-    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-                "LVDS1 Power Sequence: %s Control\n",
-                ctrlType ? "Software" : "Hardware");
+    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                        "LVDS1 Power Sequence: %s Control\n",
+                        ctrlType ? "Software" : "Hardware"));
 }
 
 /*
@@ -303,9 +303,9 @@ viaLVDS1SetSoftData(ScrnInfoPtr pScrn, Bool softOn)
      *             1: On */
     ViaCrtcMask(VGAHWPTR(pScrn), 0x91, softOn ? BIT(3) : 0,
                 BIT(3));
-    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-                "LVDS1 Software Controlled Data Path: %s\n",
-                softOn ? "On" : "Off");
+    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                        "LVDS1 Software Controlled Data Path: %s\n",
+                        softOn ? "On" : "Off"));
 }
 
 /*
@@ -320,9 +320,9 @@ viaLVDS1SetSoftVdd(ScrnInfoPtr pScrn, Bool softOn)
      *             1: On */
     ViaCrtcMask(VGAHWPTR(pScrn), 0x91, softOn ? BIT(4) : 0,
                 BIT(4));
-    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-                "LVDS1 Software Controlled Vdd: %s\n",
-                softOn ? "On" : "Off");
+    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                        "LVDS1 Software Controlled Vdd: %s\n",
+                        softOn ? "On" : "Off"));
 }
 
 /*
@@ -339,9 +339,9 @@ viaLVDS1SetSoftDisplayPeriod(ScrnInfoPtr pScrn, Bool softOn)
      *             1: Off */
     ViaCrtcMask(VGAHWPTR(pScrn), 0x91, softOn ? 0 : BIT(7),
                 BIT(7));
-    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-                "LVDS1 Software Controlled Display Period: %s\n",
-                softOn ? "On" : "Off");
+    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                        "LVDS1 Software Controlled Display Period: %s\n",
+                        softOn ? "On" : "Off"));
 }
 
 /*
@@ -356,9 +356,9 @@ viaTMDSSetPower(ScrnInfoPtr pScrn, Bool powerState)
      *             1: TMDS power down */
     ViaCrtcMask(VGAHWPTR(pScrn), 0xD2, powerState ? 0 : BIT(3),
                 BIT(3));
-    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-                "TMDS (DVI) Power State: %s\n",
-                powerState ? "On" : "Off");
+    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                        "TMDS (DVI) Power State: %s\n",
+                        powerState ? "On" : "Off"));
 }
 
 /*
@@ -376,11 +376,11 @@ viaTMDSSetSyncPolarity(ScrnInfoPtr pScrn, CARD8 syncPolarity)
      *             1: Negative */
     ViaCrtcMask(VGAHWPTR(pScrn), 0x97, syncPolarity << 5, BIT(6) | BIT(5));
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-                "TMDS (DVI) Horizontal Sync Polarity: %s\n",
-                (syncPolarity & BIT(0)) ? "-" : "+"));
+                        "TMDS (DVI) Horizontal Sync Polarity: %s\n",
+                        (syncPolarity & BIT(0)) ? "-" : "+"));
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-                "TMDS (DVI) Vertical Sync Polarity: %s\n",
-                (syncPolarity & BIT(1)) ? "-" : "+"));
+                        "TMDS (DVI) Vertical Sync Polarity: %s\n",
+                        (syncPolarity & BIT(1)) ? "-" : "+"));
 }
 
 /*
commit 3bf350973f73884862b047cc8b25c86b9b0d3ec5
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Tue Apr 11 00:46:55 2017 -0700

    Added comments to viaTMDSSetSyncPolarity
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_ums.h b/src/via_ums.h
index 835f202..0c4dde3 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -273,25 +273,6 @@ viaAnalogSetDisplaySource(ScrnInfoPtr pScrn, CARD8 displaySource)
                         (displaySource & 0x01) + 1));
 }
 
-static inline void
-viaTMDSSetSyncPolarity(ScrnInfoPtr pScrn, CARD8 syncPolarity)
-{
-    /* Set TMDS (DVI) sync polarity. */
-    /* 3X5.97[6] - DVI (TMDS) VSYNC Polarity
-     *             0: Positive
-     *             1: Negative
-     * 3X5.97[5] - DVI (TMDS) HSYNC Polarity
-     *             0: Positive
-     *             1: Negative */
-    ViaCrtcMask(VGAHWPTR(pScrn), 0x97, syncPolarity << 5, BIT(6) | BIT(5));
-    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-                "TMDS (DVI) Horizontal Sync Polarity: %s\n",
-                (syncPolarity & BIT(0)) ? "-" : "+"));
-    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-                "TMDS (DVI) Vertical Sync Polarity: %s\n",
-                (syncPolarity & BIT(1)) ? "-" : "+"));
-}
-
 /*
  * Sets CX700 or later single chipset's LVDS1 power sequence type.
  */
@@ -381,6 +362,28 @@ viaTMDSSetPower(ScrnInfoPtr pScrn, Bool powerState)
 }
 
 /*
+ * Sets CX700 / VX700 and VX800 chipsets' TMDS (DVI) sync polarity.
+ */
+static inline void
+viaTMDSSetSyncPolarity(ScrnInfoPtr pScrn, CARD8 syncPolarity)
+{
+    /* Set TMDS (DVI) sync polarity. */
+    /* 3X5.97[6] - DVI (TMDS) VSYNC Polarity
+     *             0: Positive
+     *             1: Negative
+     * 3X5.97[5] - DVI (TMDS) HSYNC Polarity
+     *             0: Positive
+     *             1: Negative */
+    ViaCrtcMask(VGAHWPTR(pScrn), 0x97, syncPolarity << 5, BIT(6) | BIT(5));
+    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                "TMDS (DVI) Horizontal Sync Polarity: %s\n",
+                (syncPolarity & BIT(0)) ? "-" : "+"));
+    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                "TMDS (DVI) Vertical Sync Polarity: %s\n",
+                (syncPolarity & BIT(1)) ? "-" : "+"));
+}
+
+/*
  * Sets TMDS (DVI) display source.
  */
 static inline void
commit bd7309f3b8b5ff10688558139f84917195080176
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Tue Apr 11 00:30:17 2017 -0700

    Added viaTMDSSetDisplaySource
    
    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 519c3eb..835f202 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -380,6 +380,24 @@ viaTMDSSetPower(ScrnInfoPtr pScrn, Bool powerState)
                 powerState ? "On" : "Off");
 }
 
+/*
+ * Sets TMDS (DVI) display source.
+ */
+static inline void
+viaTMDSSetDisplaySource(ScrnInfoPtr pScrn, CARD8 displaySource)
+{
+    /* Set integrated TMDS transmitter display output source.
+     * The integrated TMDS transmitter appears to utilize LVDS1's data
+     * source selection bit (3X5.99[4]). */
+    /* 3X5.99[4] - LVDS Channel1 Data Source Selection
+     *             0: Primary Display
+     *             1: Secondary Display */
+    ViaCrtcMask(VGAHWPTR(pScrn), 0x99, displaySource << 4, BIT(4));
+    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                        "TMDS (DVI) Display Source: IGA%d\n",
+                        (displaySource & 0x01) + 1));
+}
+
 
 /* via_ums.c */
 void viaUnmapMMIO(ScrnInfoPtr pScrn);
commit c3c75ff9c4a5e927d3c71773df8e6da29f45dd1d
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Mon Apr 10 19:58:17 2017 -0700

    Renamed viaTMDSSetSource as viaTMDSDisplaySource
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_tmds.c b/src/via_tmds.c
index ff1e828..935b22c 100644
--- a/src/via_tmds.c
+++ b/src/via_tmds.c
@@ -138,13 +138,13 @@ viaTMDSSyncPolarity(ScrnInfoPtr pScrn, unsigned int flags)
  * integrated TMDS transmitter.
  */
 static void
-viaTMDSSetSource(ScrnInfoPtr pScrn, CARD8 displaySource)
+viaTMDSDisplaySource(ScrnInfoPtr pScrn, CARD8 displaySource)
 {
     vgaHWPtr hwp = VGAHWPTR(pScrn);
     CARD8 temp = displaySource;
 
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-                        "Entered viaTMDSSetSource.\n"));
+                        "Entered viaTMDSDisplaySource.\n"));
 
     /* Set integrated TMDS transmitter display output source.
      * The integrated TMDS transmitter appears to utilize LVDS1's data
@@ -158,7 +158,7 @@ viaTMDSSetSource(ScrnInfoPtr pScrn, CARD8 displaySource)
                 (temp & 0x01) + 1);
 
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-                        "Exiting viaTMDSSetSource.\n"));
+                        "Exiting viaTMDSDisplaySource.\n"));
 }
 
 /*
@@ -894,7 +894,7 @@ via_tmds_mode_set(xf86OutputPtr output, DisplayModePtr mode,
         /* Set integrated TMDS transmitter sync polarity. */
         viaTMDSSyncPolarity(pScrn, adjusted_mode->Flags);
 
-        viaTMDSSetSource(pScrn, iga->index ? 0x01 : 0x00);
+        viaTMDSDisplaySource(pScrn, iga->index ? 0x01 : 0x00);
     }
 
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,


More information about the Openchrome-devel mailing list