Mesa (staging/20.2): anv: Add DRM_RDWR flag in anv_gem_handle_to_fd

[GitLab Mirror]

Module: Mesa
Branch: staging/20.2
Commit: d741a0714a9f7d13a0298bdbd3b61809c6eb8c78
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d741a0714a9f7d13a0298bdbd3b61809c6eb8c78

Author: Robin Ole Heinemann <robin.ole.heinemann at t-online.de>
Date:   Sun Dec 13 02:22:57 2020 +0100

anv: Add DRM_RDWR flag in anv_gem_handle_to_fd

The DRM_RDWR flag is needed for mmap with PROT_WRITE to work.

Cc: mesa-stable
Signed-off-by: Robin Ole Heinemann <robin.ole.heinemann at gmail.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8075>
(cherry picked from commit df76963a5cd56c677f189ad89d75935a76fca090)

---

 .pick_status.json          | 2 +-
 src/intel/vulkan/anv_gem.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 4ab9c9b8359..8380250abde 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -121,7 +121,7 @@
         "description": "anv: Add DRM_RDWR flag in anv_gem_handle_to_fd",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },
diff --git a/src/intel/vulkan/anv_gem.c b/src/intel/vulkan/anv_gem.c
index 9d5fbebaf2d..3300d21471b 100644
--- a/src/intel/vulkan/anv_gem.c
+++ b/src/intel/vulkan/anv_gem.c
@@ -426,7 +426,7 @@ anv_gem_handle_to_fd(struct anv_device *device, uint32_t gem_handle)
 {
    struct drm_prime_handle args = {
       .handle = gem_handle,
-      .flags = DRM_CLOEXEC,
+      .flags = DRM_CLOEXEC | DRM_RDWR,
    };
 
    int ret = gen_ioctl(device->fd, DRM_IOCTL_PRIME_HANDLE_TO_FD, &args);