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

[Kevin Brace]

 configure.ac     |    2 +-
 src/via_driver.c |   17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

New commits:
commit 0cccd476c22de296e0ce143a6a4529daf6b8b17d
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Mon Feb 3 09:56:07 2020 -0800

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

diff --git a/configure.ac b/configure.ac
index 3a4c0b0..fd058ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-openchrome],
-        [0.6.209],
+        [0.6.210],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
         [xf86-video-openchrome])
 
commit 0bbca9bdc2f504f8f29b68affafffbead8638f73
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Mon Feb 3 09:55:46 2020 -0800

    Unmap the allocated frame buffer before releasing it when winding down
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_driver.c b/src/via_driver.c
index c0fba8d..3be3463 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -1371,6 +1371,7 @@ VIACloseScreen(CLOSE_SCREEN_ARGS_DECL)
 #endif
         pVia->drmmode.fb_id = 0;
 
+        drm_bo_unmap(pScrn, pVia->drmmode.front_bo);
         drm_bo_free(pScrn, pVia->drmmode.front_bo);
     }
 
commit 78606b37a229ecd208d8d45ef87be0ae51c5e2f3
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Mon Feb 3 09:54:31 2020 -0800

    Release off screen back frame buffer before hardware cursor storage
    
    This code should have been implemented with commit
    ac4b39b1c6aafe089e741f039cceb3a5684764ef (Make off screen back frame
    buffer the last item to be allocated).
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_driver.c b/src/via_driver.c
index 889d577..c0fba8d 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -1364,14 +1364,6 @@ VIACloseScreen(CLOSE_SCREEN_ARGS_DECL)
 #endif
     xf86_cursors_fini(pScreen);
 
-    for (i = 0; i < xf86_config->num_crtc; i++) {
-        xf86CrtcPtr crtc = xf86_config->crtc[i];
-        drmmode_crtc_private_ptr iga = crtc->driver_private;
-
-        if (iga->cursor_bo)
-            drm_bo_free(pScrn, iga->cursor_bo);
-    }
-
     if (pVia->drmmode.front_bo) {
 #ifdef HAVE_DRI
         if (pVia->KMS && pVia->drmmode.fb_id)
@@ -1382,6 +1374,14 @@ VIACloseScreen(CLOSE_SCREEN_ARGS_DECL)
         drm_bo_free(pScrn, pVia->drmmode.front_bo);
     }
 
+    for (i = 0; i < xf86_config->num_crtc; i++) {
+        xf86CrtcPtr crtc = xf86_config->crtc[i];
+        drmmode_crtc_private_ptr iga = crtc->driver_private;
+
+        if (iga->cursor_bo)
+            drm_bo_free(pScrn, iga->cursor_bo);
+    }
+
 #ifdef HAVE_DRI
     if (pVia->directRenderingType == DRI_1)
         VIADRICloseScreen(pScreen);