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

[Kevin Brace]

 configure.ac     |    2 -
 src/via_driver.c |  104 +++++++++++++++++++++++++++++--------------------------
 2 files changed, 56 insertions(+), 50 deletions(-)

New commits:
commit cfa4de3dd89682bfa481267de00a398fa2d6bf65
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Mon Feb 10 10:27:49 2020 -0800

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

diff --git a/configure.ac b/configure.ac
index 741dea6..60d9e9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-openchrome],
-        [0.6.211],
+        [0.6.212],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
         [xf86-video-openchrome])
 
commit c3a415992868287f7885a012b47837e3879cd860
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Mon Feb 10 10:21:35 2020 -0800

    Initialize EXA before acceleration is initialized
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_driver.c b/src/via_driver.c
index dfb3f33..98767fa 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -1503,6 +1503,12 @@ VIAScreenInit(SCREEN_INIT_ARGS_DECL)
 #endif
     }
 
+    if (!pVia->NoAccel) {
+        if (!viaInitExa(pScreen)) {
+            return FALSE;
+        }
+    }
+
     if ((!pVia->NoAccel) &&
         ((pVia->directRenderingType == DRI_NONE)
 #ifdef HAVE_DRI
@@ -1514,9 +1520,6 @@ VIAScreenInit(SCREEN_INIT_ARGS_DECL)
         }
     }
 
-    if (!pVia->NoAccel && !viaInitExa(pScreen))
-        return FALSE;
-
     xf86SetBackingStore(pScreen);
 
     xf86SetSilkenMouse(pScreen);
commit 8e50f43ef0cb995159a15921df33e753138758b0
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Mon Feb 10 10:21:24 2020 -0800

    Correct how viaUMSCreate() is invoked
    
    The HAVE_DRI macro should have been used when referring to DRI2.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_driver.c b/src/via_driver.c
index 585c102..dfb3f33 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -1486,7 +1486,10 @@ VIAScreenInit(SCREEN_INIT_ARGS_DECL)
     }
 #endif
 
-    if (pVia->directRenderingType != DRI_2) {
+#ifdef HAVE_DRI
+    if (pVia->directRenderingType != DRI_2)
+#endif /* HAVE_DRI */
+    {
         if (!viaUMSCreate(pScrn)) {
             return FALSE;
         }
commit c3ed8f63902097c2722f6b29fec19167b8e14774
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Mon Feb 10 10:21:06 2020 -0800

    Initialize frame buffer after screen parameters are mostly initialized
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_driver.c b/src/via_driver.c
index 3be3463..585c102 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -1416,53 +1416,6 @@ VIAScreenInit(SCREEN_INIT_ARGS_DECL)
 
     pScrn->pScreen = pScreen;
 
-#ifdef HAVE_DRI
-    if (pVia->KMS) {
-        if (drmSetMaster(pVia->drmmode.fd)) {
-            xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-                        "drmSetMaster failed: %s\n",
-                        strerror(errno));
-            return FALSE;
-        }
-    }
-
-    if (pVia->drmmode.fd != -1) {
-        if (pVia->directRenderingType == DRI_1) {
-            /* DRI2 or DRI1 support */
-            if (VIADRI1ScreenInit(pScreen))
-                DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-                                    "DRI1 ScreenInit complete.\n"));
-            else
-                pVia->directRenderingType = DRI_NONE;
-        }
-    }
-#endif
-
-    if (pVia->directRenderingType != DRI_2) {
-        if (!viaUMSCreate(pScrn)) {
-            return FALSE;
-        }
-
-#ifdef HAVE_DRI
-        if (pVia->directRenderingType == DRI_1) {
-            if (!VIADRIKernelInit(pScrn)) {
-                return FALSE;
-            }
-        }
-#endif
-    }
-
-    if ((!pVia->NoAccel) &&
-        ((pVia->directRenderingType == DRI_NONE)
-#ifdef HAVE_DRI
-        || (pVia->directRenderingType == DRI_1)
-#endif /* HAVE_DRI */
-        )) {
-        if (!viaUMSAccelInit(pScrn->pScreen)) {
-            return FALSE;
-        }
-    }
-
     miClearVisualTypes();
 
     if (!miSetVisualTypes(pScrn->depth,
@@ -1511,6 +1464,53 @@ VIAScreenInit(SCREEN_INIT_ARGS_DECL)
     /* Must be after RGB ordering is fixed. */
     fbPictureInit(pScreen, NULL, 0);
 
+#ifdef HAVE_DRI
+    if (pVia->KMS) {
+        if (drmSetMaster(pVia->drmmode.fd)) {
+            xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+                        "drmSetMaster failed: %s\n",
+                        strerror(errno));
+            return FALSE;
+        }
+    }
+
+    if (pVia->drmmode.fd != -1) {
+        if (pVia->directRenderingType == DRI_1) {
+            /* DRI2 or DRI1 support */
+            if (VIADRI1ScreenInit(pScreen))
+                DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                                    "DRI1 ScreenInit complete.\n"));
+            else
+                pVia->directRenderingType = DRI_NONE;
+        }
+    }
+#endif
+
+    if (pVia->directRenderingType != DRI_2) {
+        if (!viaUMSCreate(pScrn)) {
+            return FALSE;
+        }
+
+#ifdef HAVE_DRI
+        if (pVia->directRenderingType == DRI_1) {
+            if (!VIADRIKernelInit(pScrn)) {
+                return FALSE;
+            }
+        }
+#endif
+    }
+
+    if ((!pVia->NoAccel) &&
+        ((pVia->directRenderingType == DRI_NONE)
+#ifdef HAVE_DRI
+        || (pVia->directRenderingType == DRI_1)
+#endif /* HAVE_DRI */
+        )) {
+        if (!viaUMSAccelInit(pScrn->pScreen)) {
+            return FALSE;
+        }
+    }
+
     if (!pVia->NoAccel && !viaInitExa(pScreen))
         return FALSE;