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

[Kevin Brace]

 configure.ac  |    2 +-
 src/via_ums.c |   18 ++++++++----------
 2 files changed, 9 insertions(+), 11 deletions(-)

New commits:
commit 9b8d32c0c0adfd218b8bc86cc0ed871805c6154e
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Wed Jan 22 16:27:57 2020 -0800

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

diff --git a/configure.ac b/configure.ac
index aff9299..3a4c0b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-openchrome],
-        [0.6.208],
+        [0.6.209],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
         [xf86-video-openchrome])
 
commit aba01c5bc10ceb5969f891b9a15b0ae9074d0c8b
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Wed Jan 22 16:27:16 2020 -0800

    Fix for commit 9a6d8615a8ca999528cad288d7858edf5834ae04
    
    Commit 9a6d8615a8ca999528cad288d7858edf5834ae04 (Minor code clean up
    inside viaUMSCreate()) introduced a bug that causes a screen
    initialization failure if the reserved VRAM is fairly small like 32 MB.
    
    Suggested-by: Eric Kudzin <knoppix1337 at yahoo.com>
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_ums.c b/src/via_ums.c
index 1f119c1..3d1a3a9 100644
--- a/src/via_ums.c
+++ b/src/via_ums.c
@@ -745,17 +745,15 @@ viaUMSCreate(ScrnInfoPtr pScrn)
     offset = (pVia->FBFreeStart + ((pScrn->bitsPerPixel >> 3) - 1)) /
                 (pScrn->bitsPerPixel >> 3);
     size = (pVia->FBFreeEnd / (pScrn->bitsPerPixel >> 3)) - offset;
-    if (size <= 0) {
-        ret = FALSE;
-        goto exit;
-    }
 
-    ret = xf86InitFBManagerLinear(pScreen, offset, size);
-    if (!ret) {
-        xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-                    "xf86InitFBManagerLinear initialization "
-                    "failed.\n");
-        goto exit;
+    if (size > 0) {
+        ret = xf86InitFBManagerLinear(pScreen, offset, size);
+        if (!ret) {
+            xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+                        "xf86InitFBManagerLinear initialization "
+                        "failed.\n");
+            goto exit;
+        }
     }
 
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,