[openchrome-devel] xf86-video-openchrome: 4 commits - configure.ac src/via_driver.c src/via_ums.c src/via_ums.h

[Kevin Brace]

 configure.ac     |    2 +-
 src/via_driver.c |    7 +------
 src/via_ums.c    |    5 ++---
 src/via_ums.h    |    2 +-
 4 files changed, 5 insertions(+), 11 deletions(-)

New commits:
commit 6d58bec97f2f7a660cea389250524d645c64e666
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Mon Mar 9 20:16:52 2020 -0700

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

diff --git a/configure.ac b/configure.ac
index 653ee03..6b18599 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-openchrome],
-        [0.6.217],
+        [0.6.218],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
         [xf86-video-openchrome])
 
commit 5f120657cf39910a0b9c17af54a0bd6fcdb95afe
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Mon Mar 9 20:14:53 2020 -0700

    Pass a ScrnInfoPtr type pointer when calling viaUMSAccelInit()
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_driver.c b/src/via_driver.c
index ffd76c9..41359b9 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -1511,7 +1511,7 @@ VIAScreenInit(SCREEN_INIT_ARGS_DECL)
         || (pVia->directRenderingType == DRI_1)
 #endif /* HAVE_DRI */
         )) {
-        if (!viaUMSAccelInit(pScrn->pScreen)) {
+        if (!viaUMSAccelInit(pScrn)) {
             return FALSE;
         }
     }
diff --git a/src/via_ums.c b/src/via_ums.c
index a54f032..4047500 100644
--- a/src/via_ums.c
+++ b/src/via_ums.c
@@ -648,9 +648,8 @@ viaInitialize3DEngine(ScrnInfoPtr pScrn)
  * and initializes engines and acceleration method.
  */
 Bool
-viaUMSAccelInit(ScreenPtr pScreen)
+viaUMSAccelInit(ScrnInfoPtr pScrn)
 {
-    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
     VIAPtr pVia = VIAPTR(pScrn);
     Bool ret = FALSE;
 
diff --git a/src/via_ums.h b/src/via_ums.h
index 9c58822..8adef52 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -1557,7 +1557,7 @@ viaSetDisplayScaling(ScrnInfoPtr pScrn, Bool scalingState)
 
 /* via_ums.c */
 void viaDisableVQ(ScrnInfoPtr pScrn);
-Bool viaUMSAccelInit(ScreenPtr pScreen);
+Bool viaUMSAccelInit(ScrnInfoPtr pScrn);
 Bool viaUMSCreate(ScrnInfoPtr pScrn);
 void viaUMSDestroy(ScrnInfoPtr pScrn);
 Bool viaUMSPreInit(ScrnInfoPtr pScrn);
commit dc79fc796625d62577c6d141a0005f4de78ca358
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Mon Mar 9 20:08:58 2020 -0700

    Reject color depth other than 8, 16, or 24 bits
    
    Color depth and bpp (Bits Per Pixel) are not the same.  VIA Technologies
    Chrome IGP does not support 32 bit color depth.  It does, however,
    support 24 bit color depth and 32 bit bpp.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_driver.c b/src/via_driver.c
index 8bc3c73..ffd76c9 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -863,11 +863,6 @@ VIAPreInit(ScrnInfoPtr pScrn, int flags)
         case 8:
         case 16:
         case 24:
-            /* OK */
-            break;
-        case 32:
-            /* OK */
-            pScrn->depth = 24;
             break;
         default:
             xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
commit 14ebf3d3de2b37a3fcbbb92e81080bed1b54719c
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Mon Mar 9 20:02:00 2020 -0700

    viaUnmapMMIO() should now be a static function
    
    Commit 5622df16bebeffa50442c5e566d37d71b658f910 (Add viaUMSPreInitExit()
    for unmapping MMIOs) should have declared viaUnmapMMIO() as a static
    function.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_ums.c b/src/via_ums.c
index 6fad307..a54f032 100644
--- a/src/via_ums.c
+++ b/src/via_ums.c
@@ -221,7 +221,7 @@ fail:
     return FALSE;
 }
 
-void
+static void
 viaUnmapMMIO(ScrnInfoPtr pScrn)
 {
     VIAPtr pVia = VIAPTR(pScrn);