Date: Thu, 20 Jul 2023 00:52:30 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 620b228da873 - 2023Q3 - graphics/mesa-devel: update to 23.2.0.b.320 Message-ID: <202307200052.36K0qUne062623@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2023Q3 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=620b228da873a3dc5e3d0ac4a18390006302b6a2 commit 620b228da873a3dc5e3d0ac4a18390006302b6a2 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2023-07-19 23:28:31 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2023-07-20 00:50:26 +0000 graphics/mesa-devel: update to 23.2.0.b.320 Changes: https://gitlab.freedesktop.org/mesa/mesa/-/compare/a6edac37640...539bf3929b0 (cherry picked from commit 9f622dae5c71e3ed56fb74581b9a34fe5d67dff7) --- graphics/mesa-devel/Makefile | 4 ++-- graphics/mesa-devel/distinfo | 6 +++--- graphics/mesa-devel/files/patch-userptr | 30 +++++++++++++++--------------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile index a70a3b1a36ef..ba12a6bd17d7 100644 --- a/graphics/mesa-devel/Makefile +++ b/graphics/mesa-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= mesa -DISTVERSION= 23.2.0-branchpoint-164 -DISTVERSIONSUFFIX= -ga6edac37640 +DISTVERSION= 23.2.0-branchpoint-320 +DISTVERSIONSUFFIX= -g539bf3929b0 CATEGORIES= graphics PKGNAMESUFFIX= -devel diff --git a/graphics/mesa-devel/distinfo b/graphics/mesa-devel/distinfo index 4ed0f1fc75a5..c03213016802 100644 --- a/graphics/mesa-devel/distinfo +++ b/graphics/mesa-devel/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1689635299 -SHA256 (mesa3d-mesa-23.2.0-branchpoint-164-ga6edac37640_GH0.tar.gz) = 7e2752e5970d3d322535233d06b19bf0310c499f6c9e1db82ee9e34a98f5ae55 -SIZE (mesa3d-mesa-23.2.0-branchpoint-164-ga6edac37640_GH0.tar.gz) = 29560542 +TIMESTAMP = 1689810362 +SHA256 (mesa3d-mesa-23.2.0-branchpoint-320-g539bf3929b0_GH0.tar.gz) = 4a3530d10fa109ecfaf1a1303dcb683cec468d79b27eaa779eae08e1b3202b7b +SIZE (mesa3d-mesa-23.2.0-branchpoint-320-g539bf3929b0_GH0.tar.gz) = 29575160 SHA256 (700efacda59c.patch) = 0d567fe737ad1404e1f12d7cd018826d9095c23835f1ed5aaa1c81cb58d3d008 SIZE (700efacda59c.patch) = 983 SHA256 (3043f16d66bf.patch) = 7afdba18fc3041dc6e30bdb1409f5214e451e7e5ceaa3b21991d6b2f793d9c85 diff --git a/graphics/mesa-devel/files/patch-userptr b/graphics/mesa-devel/files/patch-userptr index 59d489154145..eb4193ce8674 100644 --- a/graphics/mesa-devel/files/patch-userptr +++ b/graphics/mesa-devel/files/patch-userptr @@ -2,9 +2,9 @@ Try unsynchronized userptr if regular one fails. https://github.com/FreeBSDDesktop/kms-drm/issues/197 https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13162 ---- src/gallium/drivers/crocus/crocus_bufmgr.c.orig 2021-06-30 22:34:42 UTC +--- src/gallium/drivers/crocus/crocus_bufmgr.c.orig 2023-07-19 23:28:31 UTC +++ src/gallium/drivers/crocus/crocus_bufmgr.c -@@ -493,8 +493,20 @@ crocus_bo_create_userptr(struct crocus_bufmgr *bufmgr, +@@ -487,8 +487,20 @@ crocus_bo_create_userptr(struct crocus_bufmgr *bufmgr, .user_ptr = (uintptr_t)ptr, .user_size = size, }; @@ -26,11 +26,11 @@ https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13162 bo->gem_handle = arg.handle; /* Check the buffer for validity before we try and use it in a batch */ ---- src/gallium/drivers/iris/iris_bufmgr.c.orig 2021-03-10 22:23:51 UTC +--- src/gallium/drivers/iris/iris_bufmgr.c.orig 2023-07-19 23:28:31 UTC +++ src/gallium/drivers/iris/iris_bufmgr.c -@@ -624,8 +624,20 @@ iris_bo_create_userptr(struct iris_bufmgr *bufmgr, con - .user_ptr = (uintptr_t)ptr, +@@ -1314,8 +1314,20 @@ iris_bo_create_userptr(struct iris_bufmgr *bufmgr, con .user_size = size, + .flags = bufmgr->devinfo.has_userptr_probe ? I915_USERPTR_PROBE : 0, }; - if (intel_ioctl(bufmgr->fd, DRM_IOCTL_I915_GEM_USERPTR, &arg)) + @@ -49,12 +49,12 @@ https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13162 + } bo->gem_handle = arg.handle; - /* Check the buffer for validity before we try and use it in a batch */ ---- src/intel/vulkan/anv_gem.c.orig 2021-03-10 22:23:51 UTC -+++ src/intel/vulkan/anv_gem.c -@@ -146,9 +146,19 @@ anv_gem_userptr(struct anv_device *device, void *mem, - .flags = 0, - }; + if (!bufmgr->devinfo.has_userptr_probe) { +--- src/intel/vulkan_hasvk/anv_gem.c.orig 2023-07-19 23:28:31 UTC ++++ src/intel/vulkan_hasvk/anv_gem.c +@@ -150,9 +150,19 @@ anv_gem_userptr(struct anv_device *device, void *mem, + if (device->physical->info.has_userptr_probe) + userptr.flags |= I915_USERPTR_PROBE; - int ret = intel_ioctl(device->fd, DRM_IOCTL_I915_GEM_USERPTR, &userptr); - if (ret == -1) @@ -74,10 +74,10 @@ https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13162 return userptr.handle; } ---- src/intel/vulkan_hasvk/anv_gem.c.orig 2022-09-03 20:27:51 UTC -+++ src/intel/vulkan_hasvk/anv_gem.c -@@ -179,9 +179,19 @@ anv_gem_userptr(struct anv_device *device, void *mem, - if (device->physical->has_userptr_probe) +--- src/intel/vulkan/i915/anv_kmd_backend.c.orig 2023-07-19 23:28:31 UTC ++++ src/intel/vulkan/i915/anv_kmd_backend.c +@@ -191,9 +191,19 @@ i915_gem_create_userptr(struct anv_device *device, voi + if (device->physical->info.has_userptr_probe) userptr.flags |= I915_USERPTR_PROBE; - int ret = intel_ioctl(device->fd, DRM_IOCTL_I915_GEM_USERPTR, &userptr);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307200052.36K0qUne062623>