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

[Kevin Brace]

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

New commits:
commit 9499683acdaa133385457bc7e35ce52d656f280b
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Sat Jun 4 18:24:35 2022 -0500

    Version bumped to 0.6.411
    
    Put in a fix that will make explicitly disabling acceleration via
    xorg.conf work properly again.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/configure.ac b/configure.ac
index 0602cae..0d01bd3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-openchrome],
-        [0.6.410],
+        [0.6.411],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
         [xf86-video-openchrome])
 
commit 4100db9adf1c4e26bd966a55db3b8e79ad426e69
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Sat Jun 4 18:24:35 2022 -0500

    Fix for explicitly disabling acceleration causing a crash
    
    Explicitly disabling acceleration via xorg.conf was causing X Server
    to crash during boot up.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_memmgr.c b/src/via_memmgr.c
index ea1ba86..343370e 100644
--- a/src/via_memmgr.c
+++ b/src/via_memmgr.c
@@ -93,7 +93,7 @@ drm_bo_alloc(ScrnInfoPtr pScrn, unsigned long size,
     case TTM_PL_TT:
     case TTM_PL_VRAM:
         if (pVia->directRenderingType == DRI_NONE) {
-            if (!pVia->useEXA) {
+            if ((pVia->NoAccel) || (!pVia->useEXA)) {
                 ret = viaOffScreenLinear(pScrn, obj,
                                             size, alignment);
                 if (ret) {
@@ -299,7 +299,7 @@ drm_bo_free(ScrnInfoPtr pScrn, struct buffer_object *obj)
         case TTM_PL_VRAM:
         case TTM_PL_TT:
             if (pVia->directRenderingType == DRI_NONE) {
-                if (!pVia->useEXA) {
+                if ((pVia->NoAccel) || (!pVia->useEXA)) {
                     FBLinearPtr linear = (FBLinearPtr) obj->handle;
 
                     xf86FreeOffscreenLinear(linear);
diff --git a/src/via_ums.c b/src/via_ums.c
index c7e5d56..0c1adce 100644
--- a/src/via_ums.c
+++ b/src/via_ums.c
@@ -856,7 +856,7 @@ viaUMSScreenInit(ScrnInfoPtr pScrn)
                         "Entered %s.\n", __func__));
 
     if (pVia->directRenderingType == DRI_NONE) {
-        if (!pVia->useEXA) {
+        if ((pVia->NoAccel) || (!pVia->useEXA)) {
             if (!viaInitFB(pScrn)) {
                 ret = FALSE;
             }