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

[Kevin Brace]

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

New commits:
commit 120a780e460e4cc51dee854b266dfcb22784746b
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date:   Tue Jan 17 18:31:02 2023 -0600

    Version bumped to 0.6.603
    
    Resolves drmCloseBufferHandle() libdrm compilation issue.  The use
    of this call will be revisited eventually, but for now, it should
    not be used since it was introduced only with libdrm 2.4.108 very
    recently.
    
    Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>

diff --git a/configure.ac b/configure.ac
index 6bc88ec..7c1156d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-openchrome],
-        [0.6.602],
+        [0.6.603],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
         [xf86-video-openchrome])
 
commit ee88fd8265b2fdf8fbb2aea441f6b23aeb648e45
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date:   Tue Jan 17 18:13:43 2023 -0600

    Revert "Use drmCloseBufferHandle() provided by libdrm"
    
    This reverts commit 61c14ff37dfee8e6b58733d3cc1a265a11f63e6d.

diff --git a/src/via_memmgr.c b/src/via_memmgr.c
index 8e77756..9f507b1 100644
--- a/src/via_memmgr.c
+++ b/src/via_memmgr.c
@@ -285,9 +285,12 @@ drm_bo_free(ScrnInfoPtr pScrn, struct buffer_object *obj)
                     return;
                 }
             } else  if (pVia->directRenderingType == DRI_2) {
+                struct drm_gem_close close;
+
                 munmap(obj->ptr, obj->size);
 
-                if (drmCloseBufferHandle(pVia->drmmode.fd, obj->handle)) {
+                close.handle = obj->handle;
+                if (drmIoctl(pVia->drmmode.fd, DRM_IOCTL_GEM_CLOSE, &close) < 0) {
                     ErrorF("DRM failed to free for handle %lu.\n", obj->handle);
                     return;
                 }