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

[Kevin Brace]

 configure.ac      |    2 +-
 src/via_display.c |   24 ++++++++++++++++++++++++
 src/via_outputs.c |   25 -------------------------
 src/via_ums.h     |    2 +-
 4 files changed, 26 insertions(+), 27 deletions(-)

New commits:
commit 72df9321baf4ea680525dd91877d45fb4d0fe944
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Thu Apr 14 18:03:50 2016 -0700

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

diff --git a/configure.ac b/configure.ac
index c3ad780..a64d2ad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-openchrome],
-        [0.4.114],
+        [0.4.115],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
         [xf86-video-openchrome])
 
commit c1084103a539069a7ea7e94610fe72724c86b9d3
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Thu Apr 14 18:02:12 2016 -0700

    Moving ViaModeSecondCRTC from via_outputs.c to via_display.c
    
    This function really belongs inside via_display.c.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_display.c b/src/via_display.c
index 974c9fc..91c2c9d 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -587,6 +587,30 @@ ViaSecondCRTCHorizontalOffset(ScrnInfoPtr pScrn)
 }
 
 void
+ViaModeSecondCRTC(ScrnInfoPtr pScrn, DisplayModePtr mode)
+{
+    VIAPtr pVia = VIAPTR(pScrn);
+    VIABIOSInfoPtr pBIOSInfo = pVia->pBIOSInfo;
+    vgaHWPtr hwp = VGAHWPTR(pScrn);
+    DisplayModePtr realMode = mode;
+
+    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ViaModeSecondCRTC\n"));
+
+    ViaSecondCRTCSetMode(pScrn, realMode);
+    ViaSetSecondaryFIFO(pScrn, realMode);
+    pBIOSInfo->Clock = ViaModeDotClockTranslate(pScrn, realMode);
+
+    /* Fix LCD scaling */
+    ViaSecondCRTCHorizontalQWCount(pScrn, mode->CrtcHDisplay);
+
+    pBIOSInfo->ClockExternal = FALSE;
+    ViaSetSecondaryDotclock(pScrn, pBIOSInfo->Clock);
+    ViaSetUseExternalClock(hwp);
+
+    hwp->disablePalette(hwp);
+}
+
+void
 ViaSecondCRTCSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode)
 {
     VIAPtr pVia = VIAPTR(pScrn);
diff --git a/src/via_outputs.c b/src/via_outputs.c
index 4e0c97e..d825fa4 100644
--- a/src/via_outputs.c
+++ b/src/via_outputs.c
@@ -1323,28 +1323,3 @@ viaTMDSPower(ScrnInfoPtr pScrn, Bool On)
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
                         "Exiting viaTMDSPower.\n"));
 }
-
-void
-ViaModeSecondCRTC(ScrnInfoPtr pScrn, DisplayModePtr mode)
-{
-    VIAPtr pVia = VIAPTR(pScrn);
-    VIABIOSInfoPtr pBIOSInfo = pVia->pBIOSInfo;
-    vgaHWPtr hwp = VGAHWPTR(pScrn);
-    DisplayModePtr realMode = mode;
-
-    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ViaModeSecondCRTC\n"));
-
-    ViaSecondCRTCSetMode(pScrn, realMode);
-    ViaSetSecondaryFIFO(pScrn, realMode);
-    pBIOSInfo->Clock = ViaModeDotClockTranslate(pScrn, realMode);
-
-    /* Fix LCD scaling */
-    ViaSecondCRTCHorizontalQWCount(pScrn, mode->CrtcHDisplay);
-
-    pBIOSInfo->ClockExternal = FALSE;
-    ViaSetSecondaryDotclock(pScrn, pBIOSInfo->Clock);
-    ViaSetUseExternalClock(hwp);
-
-    hwp->disablePalette(hwp);
-}
-
diff --git a/src/via_ums.h b/src/via_ums.h
index 80c47bd..c11422a 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -198,7 +198,6 @@ void ViaTVRestore(ScrnInfoPtr pScrn);
 #ifdef HAVE_DEBUG
 void ViaTVPrintRegs(ScrnInfoPtr pScrn);
 #endif
-void ViaModeSecondCRTC(ScrnInfoPtr pScrn, DisplayModePtr mode);
 void ViaSetPrimaryDotclock(ScrnInfoPtr pScrn, CARD32 clock);
 void ViaSetSecondaryDotclock(ScrnInfoPtr pScrn, CARD32 clock);
 void ViaSetUseExternalClock(vgaHWPtr hwp);
@@ -212,6 +211,7 @@ void ViaFirstCRTCSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode);
 void ViaSecondCRTCSetStartingAddress(xf86CrtcPtr crtc, int x, int y);
 void ViaSecondCRTCHorizontalOffset(ScrnInfoPtr pScrn);
 void ViaSecondCRTCHorizontalQWCount(ScrnInfoPtr pScrn, int width);
+void ViaModeSecondCRTC(ScrnInfoPtr pScrn, DisplayModePtr mode);
 void ViaSecondCRTCSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode);
 void ViaShadowCRTCSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode);
 void ViaGammaDisable(ScrnInfoPtr pScrn);