Date: Tue, 1 Aug 2023 00:48:09 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: f6493e8ca127 - main - graphics/mesa-devel: update to 23.2.0.b.806 Message-ID: <202308010048.3710m9v7090547@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=f6493e8ca12705b1f9a3cacd11aeb5734a8f5994 commit f6493e8ca12705b1f9a3cacd11aeb5734a8f5994 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2023-07-31 18:56:34 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2023-08-01 00:47:26 +0000 graphics/mesa-devel: update to 23.2.0.b.806 Changes: https://gitlab.freedesktop.org/mesa/mesa/-/compare/5df97c27dc8...c9b2f83a2fb --- graphics/mesa-devel/Makefile | 4 ++-- graphics/mesa-devel/distinfo | 6 +++--- graphics/mesa-devel/files/patch-userptr | 18 +++++++++--------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile index c89279c4c825..d7e04315a330 100644 --- a/graphics/mesa-devel/Makefile +++ b/graphics/mesa-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= mesa -DISTVERSION= 23.2.0-branchpoint-786 -DISTVERSIONSUFFIX= -g5df97c27dc8 +DISTVERSION= 23.2.0-branchpoint-806 +DISTVERSIONSUFFIX= -gc9b2f83a2fb CATEGORIES= graphics PKGNAMESUFFIX= -devel diff --git a/graphics/mesa-devel/distinfo b/graphics/mesa-devel/distinfo index 845583f8820a..6ac733b2bdd3 100644 --- a/graphics/mesa-devel/distinfo +++ b/graphics/mesa-devel/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1690584899 -SHA256 (mesa3d-mesa-23.2.0-branchpoint-786-g5df97c27dc8_GH0.tar.gz) = 2e6fec583145ceaa93f575fab1e4b6069ec4a2f3f51ec8f5c027c1e3213cf35e -SIZE (mesa3d-mesa-23.2.0-branchpoint-786-g5df97c27dc8_GH0.tar.gz) = 29591653 +TIMESTAMP = 1690829794 +SHA256 (mesa3d-mesa-23.2.0-branchpoint-806-gc9b2f83a2fb_GH0.tar.gz) = 0375e48dcdee65400acee9e313d2d5077e0c44fa1b2c0475d5663a50d0fe84a0 +SIZE (mesa3d-mesa-23.2.0-branchpoint-806-gc9b2f83a2fb_GH0.tar.gz) = 29595092 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 eb4193ce8674..7c94dba02122 100644 --- a/graphics/mesa-devel/files/patch-userptr +++ b/graphics/mesa-devel/files/patch-userptr @@ -26,17 +26,17 @@ 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 2023-07-19 23:28:31 UTC -+++ src/gallium/drivers/iris/iris_bufmgr.c -@@ -1314,8 +1314,20 @@ iris_bo_create_userptr(struct iris_bufmgr *bufmgr, con +--- src/gallium/drivers/iris/i915/iris_kmd_backend.c.orig 2023-07-31 18:56:34 UTC ++++ src/gallium/drivers/iris/i915/iris_kmd_backend.c +@@ -430,8 +430,20 @@ i915_gem_create_userptr(struct iris_bufmgr *bufmgr, vo .user_size = size, - .flags = bufmgr->devinfo.has_userptr_probe ? I915_USERPTR_PROBE : 0, + .flags = devinfo->has_userptr_probe ? I915_USERPTR_PROBE : 0, }; -- if (intel_ioctl(bufmgr->fd, DRM_IOCTL_I915_GEM_USERPTR, &arg)) +- if (intel_ioctl(iris_bufmgr_get_fd(bufmgr), DRM_IOCTL_I915_GEM_USERPTR, &arg)) + + int ret; +retry: -+ ret = intel_ioctl(bufmgr->fd, DRM_IOCTL_I915_GEM_USERPTR, &arg); ++ ret = intel_ioctl(iris_bufmgr_get_fd(bufmgr), DRM_IOCTL_I915_GEM_USERPTR, &arg); + if (ret) { + if (errno == ENODEV && arg.flags == 0) { + arg.flags = I915_USERPTR_UNSYNCHRONIZED; @@ -45,11 +45,11 @@ https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13162 + if (geteuid() != 0) { + fprintf(stderr, "%s", "ioctl(I915_GEM_USERPTR) failed. Try running as root but expect poor stability.\n"); + } - goto err_free; + return 0; + } - bo->gem_handle = arg.handle; - if (!bufmgr->devinfo.has_userptr_probe) { + if (!devinfo->has_userptr_probe) { + /* Check the buffer for validity before we try and use it in a batch */ --- 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,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308010048.3710m9v7090547>