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

[Kevin Brace]

 configure.ac     |    2 +-
 src/via_driver.c |   30 +++++++++++++++---------------
 src/via_memmgr.c |    3 +++
 src/via_ums.c    |    9 ---------
 4 files changed, 19 insertions(+), 25 deletions(-)

New commits:
commit 5e8e7d25de6638f84733886b1094df93d9c91d85
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Thu Jan 2 12:50:00 2020 -0600

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

diff --git a/configure.ac b/configure.ac
index 2fa2f9d..1fe3976 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-openchrome],
-        [0.6.199],
+        [0.6.200],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
         [xf86-video-openchrome])
 
commit 070de6b4f2fed9faf971195a09272f26204783ef
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Thu Jan 2 11:36:32 2020 -0600

    Check for a null pointer properly after allocating frame buffer memory
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_memmgr.c b/src/via_memmgr.c
index d3d1669..9b8e37c 100644
--- a/src/via_memmgr.c
+++ b/src/via_memmgr.c
@@ -106,6 +106,9 @@ drm_bo_alloc_surface(ScrnInfoPtr pScrn, unsigned int width, unsigned int height,
 
     pitch = ALIGN_TO(pitch, alignment);
     obj = drm_bo_alloc(pScrn, pitch * height, alignment, domain);
+    if (!obj)
+        goto exit;
+
     if (!obj->pitch)
         obj->pitch = pitch;
 exit:
commit cc67df118236ab35b0806c162c73c701bf5b727f
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Thu Jan 2 11:18:18 2020 -0600

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

diff --git a/configure.ac b/configure.ac
index 3feaedc..2fa2f9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-openchrome],
-        [0.6.198],
+        [0.6.199],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
         [xf86-video-openchrome])
 
commit b767b7520c040a26aea964242571fdc498197c2f
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Thu Jan 2 11:08:15 2020 -0600

    Abolish artificial 256 MB frame buffer limit
    
    Chrome9 HD (VX900 chipset) actually supports 512 MB frame buffer.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_ums.c b/src/via_ums.c
index 306478b..4f2f0fa 100644
--- a/src/via_ums.c
+++ b/src/via_ums.c
@@ -1028,15 +1028,6 @@ umsPreInit(ScrnInfoPtr pScrn)
         return FALSE;
     }
 
-    /*
-     * PCI BAR are limited to 256 MB.
-     */
-    if (pScrn->videoRam > (256 << 10)) {
-        xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-                    "Cannot use more than 256 MB of VRAM.\n");
-                    pScrn->videoRam = (256 << 10);
-    }
-
     /* Split the FB for SAMM. */
     /* FIXME: For now, split the FB into two equal sections.
      * This should be user-adjustable via a config option. */
commit dfd6bd6ab0cd2e7679241ffd79d6b4d3071d2a90
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Thu Jan 2 10:55:13 2020 -0600

    Revert commit 3145db36b4fda2e6e048cd42d743fe1372c14dbf
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_driver.c b/src/via_driver.c
index cfd4bbd..da93ddb 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -1391,21 +1391,6 @@ VIAScreenInit(SCREEN_INIT_ARGS_DECL)
     pScrn->displayWidth = pScrn->virtualX;
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "VIAScreenInit\n"));
 
-    miClearVisualTypes();
-
-    if (!miSetVisualTypes(pScrn->depth,
-            (pScrn->bitsPerPixel > 8) && (!pVia->IsSecondary) ?
-                TrueColorMask : miGetDefaultVisualMask(pScrn->depth),
-            pScrn->rgbBits, pScrn->defaultVisual)) {
-        return FALSE;
-    }
-
-    if (!miSetPixmapDepths()) {
-        return FALSE;
-    }
-
-    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "- Visuals set up\n"));
-
 #ifdef HAVE_DRI
     if (pVia->KMS) {
         if (drmSetMaster(pVia->drmmode.fd)) {
@@ -1442,6 +1427,21 @@ VIAScreenInit(SCREEN_INIT_ARGS_DECL)
     if (!pVia->NoAccel && !umsAccelInit(pScrn->pScreen))
         return FALSE;
 
+    miClearVisualTypes();
+
+    if (!miSetVisualTypes(pScrn->depth,
+            (pScrn->bitsPerPixel > 8) && (!pVia->IsSecondary) ?
+                TrueColorMask : miGetDefaultVisualMask(pScrn->depth),
+            pScrn->rgbBits, pScrn->defaultVisual)) {
+        return FALSE;
+    }
+
+    if (!miSetPixmapDepths()) {
+        return FALSE;
+    }
+
+    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "- Visuals set up\n"));
+
     if (pVia->shadowFB) {
         int pitch = BitmapBytePad(pScrn->bitsPerPixel * pScrn->virtualX);