[openchrome-devel] xf86-video-openchrome: Branch 'main' - 4 commits - configure.ac src/via_dri.c src/via_driver.c src/via_driver.h src/via_exa.c src/via_ums.c

[Kevin Brace]

 configure.ac     |    2 +-
 src/via_dri.c    |    7 -------
 src/via_driver.c |    9 ++-------
 src/via_driver.h |    9 +++++++++
 src/via_exa.c    |   36 ++++++++++++++++++------------------
 src/via_ums.c    |    3 ---
 6 files changed, 30 insertions(+), 36 deletions(-)

New commits:
commit a4ea11cb14925d2d1bdd92cf6209ed242dc4259b
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Wed Sep 2 15:47:19 2020 -0700

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

diff --git a/configure.ac b/configure.ac
index b64db0b..e991b9b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-openchrome],
-        [0.6.310],
+        [0.6.311],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
         [xf86-video-openchrome])
 
commit 0908406455ced556052246dba7f31b7bde143a73
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Wed Sep 2 15:46:21 2020 -0700

    Remove unnecessary goto statements
    
    This is to suppress compilation warnings when --disable-dri
    option is specified for makefile generation.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_ums.c b/src/via_ums.c
index e680e12..236f962 100644
--- a/src/via_ums.c
+++ b/src/via_ums.c
@@ -869,19 +869,16 @@ viaUMSScreenInit(ScrnInfoPtr pScrn)
     } else if (pVia->directRenderingType == DRI_1) {
         if (!VIADRIKernelInit(pScrn)) {
             ret = FALSE;
-            goto exit;
         }
 
         if ((!pVia->NoAccel) && (pVia->useEXA)) {
             if (!viaInitExa(pScrn->pScreen)) {
                 ret = FALSE;
-                goto exit;
             }
         }
 #endif
     }
 
-exit:
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
                         "Exiting %s.\n", __func__));
     return ret;
commit 67be048bedd7504e6187f508a41adbd121a889ea
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Wed Sep 2 15:43:33 2020 -0700

    Hide viaDumpDMA() behind OPENCHROMEDRI macro
    
    This is to suppress compilation warnings when --disable-dri
    option is specified for makefile generation.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_exa.c b/src/via_exa.c
index 7358a40..88cd974 100644
--- a/src/via_exa.c
+++ b/src/via_exa.c
@@ -43,24 +43,6 @@
 #include "via_regs.h"
 #include "via_dmabuffer.h"
 
-/*
- * Use PCI MMIO to flush the command buffer when AGP DMA is not available.
- */
-static void
-viaDumpDMA(ViaCommandBuffer *cb)
-{
-    register CARD32 *bp = cb->buf;
-    CARD32 *endp = bp + cb->pos;
-
-    while (bp != endp) {
-        if (((bp - cb->buf) & 3) == 0) {
-            ErrorF("\n %04lx: ", (unsigned long)(bp - cb->buf));
-        }
-        ErrorF("0x%08x ", (unsigned)*bp++);
-    }
-    ErrorF("\n");
-}
-
 static void
 viaFlushPCI(ViaCommandBuffer *cb)
 {
@@ -134,6 +116,24 @@ viaFlushPCI(ViaCommandBuffer *cb)
 }
 
 #ifdef OPENCHROMEDRI
+/*
+ * Use PCI MMIO to flush the command buffer when AGP DMA is not available.
+ */
+static void
+viaDumpDMA(ViaCommandBuffer *cb)
+{
+    register CARD32 *bp = cb->buf;
+    CARD32 *endp = bp + cb->pos;
+
+    while (bp != endp) {
+        if (((bp - cb->buf) & 3) == 0) {
+            ErrorF("\n %04lx: ", (unsigned long)(bp - cb->buf));
+        }
+        ErrorF("0x%08x ", (unsigned)*bp++);
+    }
+    ErrorF("\n");
+}
+
 /*
  * Flush the command buffer using DRM. If in PCI mode, we can bypass DRM,
  * but not for command buffers that contain 3D engine state, since then
commit e4637225f470a443e9ba370945294637e871e49e
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Wed Sep 2 15:40:43 2020 -0700

    Hide ViaDRMVersion typedef behind OPENCHROMEDRI macro
    
    Also, hide ViaDRMVersion based struct declaration behind
    OPENCHROMEDRI macro.  These suppress compilation warnings when
    --disable-dri option is specified for makefile generation.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_dri.c b/src/via_dri.c
index 4ffc034..15287a4 100644
--- a/src/via_dri.c
+++ b/src/via_dri.c
@@ -67,13 +67,6 @@ extern void GlxSetVisualConfigs(int nconfigs,
                                 __GLXvisualConfig * configs,
                                 void **configprivs);
 
-typedef struct
-{
-    int major;
-    int minor;
-    int patchlevel;
-} ViaDRMVersion;
-
 static char VIAKernelDriverName[] = "via";
 static char VIAClientDriverName[] = "unichrome";
 
diff --git a/src/via_driver.c b/src/via_driver.c
index 03e5942..db41677 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -57,16 +57,11 @@
 /* RandR support */
 #include "xf86RandR12.h"
 
-typedef struct
-{
-	int major;
-	int minor;
-	int patchlevel;
-} ViaDRMVersion;
-
+#ifdef OPENCHROMEDRI
 static const ViaDRMVersion drmVIADRMExpected = { 1, 3, 0 };
 static const ViaDRMVersion drmVIADRMCompat = { 3, 0, 0 };
 static const ViaDRMVersion drmOpenChromeDRMVersion = { 3, 3, 0 };
+#endif /* OPENCHROMEDRI */
 
 /* Prototypes. */
 static void VIAIdentify(int flags);
diff --git a/src/via_driver.h b/src/via_driver.h
index 6b0b95a..efd9961 100644
--- a/src/via_driver.h
+++ b/src/via_driver.h
@@ -141,6 +141,15 @@ enum dri_type {
 	DRI_2
 };
 
+#ifdef OPENCHROMEDRI
+typedef struct
+{
+    int major;
+    int minor;
+    int patchlevel;
+} ViaDRMVersion;
+#endif /* OPENCHROMEDRI */
+
 #ifdef OPENCHROMEDRI
 
 #define VIA_XVMC_MAX_BUFFERS 2