diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2021-03-11 00:20:38 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2021-03-11 00:20:38 +0000 |
| commit | 1a7487aaf57dd33b378e0983e00d2695b04e9085 (patch) | |
| tree | b00b3f49ca8ac2356c66f3cee29a2b1ee0a58df3 | |
| parent | 1fc367edd9142cfe23e4ef446535cc517b8e8f63 (diff) | |
| download | ports-1a7487aaf57dd33b378e0983e00d2695b04e9085.tar.gz ports-1a7487aaf57dd33b378e0983e00d2695b04e9085.zip | |
MFH: r567880 r568056
graphics/mesa-devel: update to 21.0.b.2806
Changes: https://gitlab.freedesktop.org/mesa/mesa/-/compare/24ce0862fe0...c22267262ee
Notes
Notes:
svn path=/branches/2021Q1/; revision=568057
| -rw-r--r-- | graphics/mesa-devel/Makefile | 4 | ||||
| -rw-r--r-- | graphics/mesa-devel/distinfo | 6 | ||||
| -rw-r--r-- | graphics/mesa-devel/files/patch-userptr | 14 |
3 files changed, 12 insertions, 12 deletions
diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile index 946de3beb112..41ff5a047eaf 100644 --- a/graphics/mesa-devel/Makefile +++ b/graphics/mesa-devel/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= mesa -DISTVERSION= 21.0-branchpoint-2670 -DISTVERSIONSUFFIX= -g24ce0862fe0 +DISTVERSION= 21.0-branchpoint-2806 +DISTVERSIONSUFFIX= -gc22267262ee CATEGORIES= graphics PKGNAMESUFFIX= -devel diff --git a/graphics/mesa-devel/distinfo b/graphics/mesa-devel/distinfo index ead3b5a68268..c1eccfee3269 100644 --- a/graphics/mesa-devel/distinfo +++ b/graphics/mesa-devel/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1614980639 -SHA256 (mesa3d-mesa-21.0-branchpoint-2670-g24ce0862fe0_GH0.tar.gz) = 9cdcf8af39fd054c12651892ff450677112d76880015b3edf2f6cc9afa18df34 -SIZE (mesa3d-mesa-21.0-branchpoint-2670-g24ce0862fe0_GH0.tar.gz) = 23061157 +TIMESTAMP = 1615418117 +SHA256 (mesa3d-mesa-21.0-branchpoint-2806-gc22267262ee_GH0.tar.gz) = b8d86694e6aa79768c16aa178f6d3dadbecb2b87062eec3f854f3a61fd12cd0b +SIZE (mesa3d-mesa-21.0-branchpoint-2806-gc22267262ee_GH0.tar.gz) = 23084033 SHA256 (9f52b5177728.patch) = d4f380b8872726b88c1aa75d0a9cb63adf79144a7c34da6b7fd525ea417d2b73 SIZE (9f52b5177728.patch) = 832 SHA256 (55822330540d.patch) = fc776fee1d59f743a060ad1f78e1d9eba8826beb1fe7abef1734a407734b6109 diff --git a/graphics/mesa-devel/files/patch-userptr b/graphics/mesa-devel/files/patch-userptr index b2f38bf0a96b..70885a10d47c 100644 --- a/graphics/mesa-devel/files/patch-userptr +++ b/graphics/mesa-devel/files/patch-userptr @@ -1,17 +1,17 @@ Try unsynchronized userptr if regular one fails. https://github.com/FreeBSDDesktop/kms-drm/issues/197 ---- src/gallium/drivers/iris/iris_bufmgr.c.orig 2020-11-25 20:08:15 UTC +--- src/gallium/drivers/iris/iris_bufmgr.c.orig 2021-03-10 22:23:51 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, .user_size = size, }; -- if (gen_ioctl(bufmgr->fd, DRM_IOCTL_I915_GEM_USERPTR, &arg)) +- if (intel_ioctl(bufmgr->fd, DRM_IOCTL_I915_GEM_USERPTR, &arg)) + + int ret; +retry: -+ ret = gen_ioctl(bufmgr->fd, DRM_IOCTL_I915_GEM_USERPTR, &arg); ++ ret = intel_ioctl(bufmgr->fd, DRM_IOCTL_I915_GEM_USERPTR, &arg); + if (ret) { + if (errno == ENODEV && arg.flags == 0) { + arg.flags = I915_USERPTR_UNSYNCHRONIZED; @@ -25,17 +25,17 @@ https://github.com/FreeBSDDesktop/kms-drm/issues/197 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 2020-11-25 20:08:15 UTC ---- src/intel/vulkan/anv_gem.c +--- 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, }; -- int ret = gen_ioctl(device->fd, DRM_IOCTL_I915_GEM_USERPTR, &userptr); +- int ret = intel_ioctl(device->fd, DRM_IOCTL_I915_GEM_USERPTR, &userptr); - if (ret == -1) + int ret; +retry: -+ ret = gen_ioctl(device->fd, DRM_IOCTL_I915_GEM_USERPTR, &userptr); ++ ret = intel_ioctl(device->fd, DRM_IOCTL_I915_GEM_USERPTR, &userptr); + if (ret == -1) { + if (errno == ENODEV && userptr.flags == 0) { + userptr.flags = I915_USERPTR_UNSYNCHRONIZED; |