summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Ole Heinemann <robin.ole.heinemann@t-online.de>2020-12-13 02:22:57 +0100
committerDylan Baker <dylan.c.baker@intel.com>2020-12-15 11:02:23 -0800
commitd741a0714a9f7d13a0298bdbd3b61809c6eb8c78 (patch)
treedcbe7dd5af87b77606b49ef9c9f1fb30beedd59f
parent786273a03b5938f207d22d192c5a9e0d4d0bdbe1 (diff)
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@gmail.com> Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8075> (cherry picked from commit df76963a5cd56c677f189ad89d75935a76fca090)
-rw-r--r--.pick_status.json2
-rw-r--r--src/intel/vulkan/anv_gem.c2
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);