Mesa (staging/19.0): vulkan/wsi: don't use DUMB_CLOSE for normal GEM handles

[GitLab Mirror]

Module: Mesa
Branch: staging/19.0
Commit: 2c68a0f41bb4a8326ffa40d300100935eef299d1
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2c68a0f41bb4a8326ffa40d300100935eef299d1

Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Fri Apr 19 12:11:00 2019 +0100

vulkan/wsi: don't use DUMB_CLOSE for normal GEM handles

Currently we get normal GEM handles from PrimeFDToHandle, yet we close
then with DUMB_CLOSE. Use GEM_CLOSE instead.

Fixes: da997ebec92 ("vulkan: Add KHR_display extension using DRM [v10]")
Cc: Jason Ekstrand <jason at jlekstrand.net>
Cc: Keith Packard <keithp at keithp.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
(cherry picked from commit bd0c4e360d08dc1b1a1433530b389358623783bb)

---

 src/vulkan/wsi/wsi_common_display.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vulkan/wsi/wsi_common_display.c b/src/vulkan/wsi/wsi_common_display.c
index 0a1cf62d498..ccde1e0e679 100644
--- a/src/vulkan/wsi/wsi_common_display.c
+++ b/src/vulkan/wsi/wsi_common_display.c
@@ -960,8 +960,8 @@ static void
 wsi_display_destroy_buffer(struct wsi_display *wsi,
                            uint32_t buffer)
 {
-   (void) drmIoctl(wsi->fd, DRM_IOCTL_MODE_DESTROY_DUMB,
-                   &((struct drm_mode_destroy_dumb) { .handle = buffer }));
+   (void) drmIoctl(wsi->fd, DRM_IOCTL_GEM_CLOSE,
+                   &((struct drm_gem_close) { .handle = buffer }));
 }
 
 static VkResult