[Openchrome-devel] xf86-video-openchrome: 3 commits - src/via_driver.c src/via_ums.c src/via_ums.h

[Kevin Brace]

 src/via_driver.c |    2 +-
 src/via_ums.c    |    2 +-
 src/via_ums.h    |   16 +++++++---------
 3 files changed, 9 insertions(+), 11 deletions(-)

New commits:
commit d2976872e7bf99e008e75499b7075dc4224b87d0
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Sun Apr 17 12:19:08 2016 -0700

    Moving via_display.c related prototypes around
    
    The prototype declarations are located 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 349e65e..82c16a0 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -204,6 +204,12 @@ void ViaSetSecondaryDotclock(ScrnInfoPtr pScrn, CARD32 clock);
 void ViaSetUseExternalClock(vgaHWPtr hwp);
 
 /* via_display.c */
+void ViaSecondDisplayChannelEnable(ScrnInfoPtr pScrn);
+void ViaSecondDisplayChannelDisable(ScrnInfoPtr pScrn);
+void ViaDisplayInit(ScrnInfoPtr pScrn);
+void ViaDisplayEnableSimultaneous(ScrnInfoPtr pScrn);
+void ViaDisplayDisableSimultaneous(ScrnInfoPtr pScrn);
+void ViaGammaDisable(ScrnInfoPtr pScrn);
 void ViaCRTCInit(ScrnInfoPtr pScrn);
 void viaIGA1SetFBStartingAddress(xf86CrtcPtr crtc, int x, int y);
 void viaIGA1SetDisplayRegister(ScrnInfoPtr pScrn, DisplayModePtr mode);
@@ -214,7 +220,6 @@ void ViaSecondCRTCHorizontalQWCount(ScrnInfoPtr pScrn, int width);
 void viaIGA2SetDisplayRegister(ScrnInfoPtr pScrn, DisplayModePtr mode);
 void viaIGA2SetMode(ScrnInfoPtr pScrn, DisplayModePtr mode);
 void ViaShadowCRTCSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode);
-void ViaGammaDisable(ScrnInfoPtr pScrn);
 
 /* via_lvds.c */
 void via_lvds_init(ScrnInfoPtr pScrn);
@@ -232,11 +237,4 @@ void ViaVT162xInit(ScrnInfoPtr pScrn);
 I2CDevPtr ViaCH7xxxDetect(ScrnInfoPtr pScrn, I2CBusPtr pBus, CARD8 Address);
 void ViaCH7xxxInit(ScrnInfoPtr pScrn);
 
-/* via_display.c */
-void ViaSecondDisplayChannelEnable(ScrnInfoPtr pScrn);
-void ViaSecondDisplayChannelDisable(ScrnInfoPtr pScrn);
-void ViaDisplayInit(ScrnInfoPtr pScrn);
-void ViaDisplayEnableSimultaneous(ScrnInfoPtr pScrn);
-void ViaDisplayDisableSimultaneous(ScrnInfoPtr pScrn);
-
 #endif /* _VIA_BIOS_H_ */
commit ee2d5d520a503cf3800688084d9904073329f7c1
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Sun Apr 17 12:08:22 2016 -0700

    Moving umsCrtcInit prototype
    
    The prototype declaration is located 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 0c4b43a..349e65e 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -186,6 +186,7 @@ Bool ums_create(ScrnInfoPtr pScrn);
 Bool UMSPreInit(ScrnInfoPtr pScrn);
 Bool UMSAccelInit(ScreenPtr pScreen);
 void viaDisableVQ(ScrnInfoPtr pScrn);
+Bool umsCrtcInit(ScrnInfoPtr pScrn);
 
 /* via_output.c */
 void ViaOutputsDetect(ScrnInfoPtr pScrn);
@@ -203,7 +204,6 @@ void ViaSetSecondaryDotclock(ScrnInfoPtr pScrn, CARD32 clock);
 void ViaSetUseExternalClock(vgaHWPtr hwp);
 
 /* via_display.c */
-Bool umsCrtcInit(ScrnInfoPtr pScrn);
 void ViaCRTCInit(ScrnInfoPtr pScrn);
 void viaIGA1SetFBStartingAddress(xf86CrtcPtr crtc, int x, int y);
 void viaIGA1SetDisplayRegister(ScrnInfoPtr pScrn, DisplayModePtr mode);
commit 15f5dfe78ba0f5fb399bf2cf990af6b758321e3d
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Sun Apr 17 11:49:36 2016 -0700

    Changing UMSCrtcInit to umsCrtcInit
    
    This function is located inside via_ums.c.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_driver.c b/src/via_driver.c
index ddffd7d..5b64ee4 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -1492,7 +1492,7 @@ viaPreInit(ScrnInfoPtr pScrn, int flags)
             return FALSE;
         }
     } else {
-        if (!UMSCrtcInit(pScrn)) {
+        if (!umsCrtcInit(pScrn)) {
             VIAFreeRec(pScrn);
             return FALSE;
         }
diff --git a/src/via_ums.c b/src/via_ums.c
index e911fe1..fd9c38b 100644
--- a/src/via_ums.c
+++ b/src/via_ums.c
@@ -877,7 +877,7 @@ UMSPreInit(ScrnInfoPtr pScrn)
 }
 
 Bool
-UMSCrtcInit(ScrnInfoPtr pScrn)
+umsCrtcInit(ScrnInfoPtr pScrn)
 {
     drmmode_crtc_private_ptr iga1_rec = NULL, iga2_rec = NULL;
     vgaHWPtr hwp = VGAHWPTR(pScrn);
diff --git a/src/via_ums.h b/src/via_ums.h
index 78eaa41..0c4b43a 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -203,7 +203,7 @@ void ViaSetSecondaryDotclock(ScrnInfoPtr pScrn, CARD32 clock);
 void ViaSetUseExternalClock(vgaHWPtr hwp);
 
 /* via_display.c */
-Bool UMSCrtcInit(ScrnInfoPtr pScrn);
+Bool umsCrtcInit(ScrnInfoPtr pScrn);
 void ViaCRTCInit(ScrnInfoPtr pScrn);
 void viaIGA1SetFBStartingAddress(xf86CrtcPtr crtc, int x, int y);
 void viaIGA1SetDisplayRegister(ScrnInfoPtr pScrn, DisplayModePtr mode);