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

[Kevin Brace]

 src/via_driver.c |    4 ++--
 src/via_memmgr.c |    2 +-
 src/via_ums.c    |   10 +++++-----
 src/via_ums.h    |    6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 980519db4d42552bb6bd2c731f12030fc3121092
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Sun Apr 17 18:23:29 2016 -0700

    Changing UMSAccelInit to umsAccelInit
    
    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 f60926a..2390b43 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -1772,7 +1772,7 @@ VIAScreenInit(SCREEN_INIT_ARGS_DECL)
     if (!drm_bo_map(pScrn, pVia->drmmode.front_bo))
         return FALSE;
 
-    if (!pVia->NoAccel && !UMSAccelInit(pScrn->pScreen))
+    if (!pVia->NoAccel && !umsAccelInit(pScrn->pScreen))
         return FALSE;
 
     miClearVisualTypes();
diff --git a/src/via_ums.c b/src/via_ums.c
index 01858ec..057c235 100644
--- a/src/via_ums.c
+++ b/src/via_ums.c
@@ -600,14 +600,14 @@ VIAInitialize3DEngine(ScrnInfoPtr pScrn)
  * and initializes engines and acceleration method.
  */
 Bool
-UMSAccelInit(ScreenPtr pScreen)
+umsAccelInit(ScreenPtr pScreen)
 {
     ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
     VIAPtr pVia = VIAPTR(pScrn);
     Bool ret = FALSE;
 
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-                        "Entered UMSAccelInit.\n"));
+                        "Entered umsAccelInit.\n"));
 
     pVia->VQStart = 0;
     pVia->vq_bo = drm_bo_alloc(pScrn, VIA_VQ_SIZE, 16, TTM_PL_FLAG_VRAM);
@@ -659,7 +659,7 @@ err:
     }
 
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-                        "Exiting UMSAccelInit.\n"));
+                        "Exiting umsAccelInit.\n"));
     return ret;
 }
 
diff --git a/src/via_ums.h b/src/via_ums.h
index 6f310ea..1d2439c 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -183,7 +183,7 @@ typedef struct _VIABIOSINFO {
 /* via_ums.c */
 void VIAUnmapMMIO(ScrnInfoPtr pScrn);
 void viaDisableVQ(ScrnInfoPtr pScrn);
-Bool UMSAccelInit(ScreenPtr pScreen);
+Bool umsAccelInit(ScreenPtr pScreen);
 Bool umsCreate(ScrnInfoPtr pScrn);
 Bool umsPreInit(ScrnInfoPtr pScrn);
 Bool umsCrtcInit(ScrnInfoPtr pScrn);
commit 978825ee16c633e523b3642294e018aee5d77953
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Sun Apr 17 18:18:53 2016 -0700

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

diff --git a/src/via_memmgr.c b/src/via_memmgr.c
index b6e2b44..d87d075 100644
--- a/src/via_memmgr.c
+++ b/src/via_memmgr.c
@@ -273,7 +273,7 @@ drm_bo_manager_init(ScrnInfoPtr pScrn)
 
     if (pVia->directRenderingType == DRI_2)
         return ret;
-    ret = ums_create(pScrn);
+    ret = umsCreate(pScrn);
 #ifdef HAVE_DRI
     if (pVia->directRenderingType == DRI_1)
         ret = VIADRIKernelInit(pScrn);
diff --git a/src/via_ums.c b/src/via_ums.c
index 95c2541..01858ec 100644
--- a/src/via_ums.c
+++ b/src/via_ums.c
@@ -664,7 +664,7 @@ err:
 }
 
 Bool
-ums_create(ScrnInfoPtr pScrn)
+umsCreate(ScrnInfoPtr pScrn)
 {
     ScreenPtr pScreen = pScrn->pScreen;
     VIAPtr pVia = VIAPTR(pScrn);
diff --git a/src/via_ums.h b/src/via_ums.h
index 90807a4..6f310ea 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -184,7 +184,7 @@ typedef struct _VIABIOSINFO {
 void VIAUnmapMMIO(ScrnInfoPtr pScrn);
 void viaDisableVQ(ScrnInfoPtr pScrn);
 Bool UMSAccelInit(ScreenPtr pScreen);
-Bool ums_create(ScrnInfoPtr pScrn);
+Bool umsCreate(ScrnInfoPtr pScrn);
 Bool umsPreInit(ScrnInfoPtr pScrn);
 Bool umsCrtcInit(ScrnInfoPtr pScrn);
 
commit d8bf6fdf169a80e6df466547fe92313916dc1b75
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Sun Apr 17 18:13:16 2016 -0700

    Changing UMSPreInit to umsPreInit
    
    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 5b64ee4..f60926a 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -1069,7 +1069,7 @@ viaPreInit(ScrnInfoPtr pScrn, int flags)
     free(busId);
 #endif
 
-    if (!UMSPreInit(pScrn)) {
+    if (!umsPreInit(pScrn)) {
         VIAFreeRec(pScrn);
         return FALSE;
     }
diff --git a/src/via_ums.c b/src/via_ums.c
index fd9c38b..95c2541 100644
--- a/src/via_ums.c
+++ b/src/via_ums.c
@@ -728,7 +728,7 @@ ums_create(ScrnInfoPtr pScrn)
 }
 
 Bool
-UMSPreInit(ScrnInfoPtr pScrn)
+umsPreInit(ScrnInfoPtr pScrn)
 {
     MessageType from = X_PROBED;
     VIAPtr pVia = VIAPTR(pScrn);
diff --git a/src/via_ums.h b/src/via_ums.h
index 9633923..90807a4 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -185,7 +185,7 @@ void VIAUnmapMMIO(ScrnInfoPtr pScrn);
 void viaDisableVQ(ScrnInfoPtr pScrn);
 Bool UMSAccelInit(ScreenPtr pScreen);
 Bool ums_create(ScrnInfoPtr pScrn);
-Bool UMSPreInit(ScrnInfoPtr pScrn);
+Bool umsPreInit(ScrnInfoPtr pScrn);
 Bool umsCrtcInit(ScrnInfoPtr pScrn);
 
 /* via_output.c */