From nobody Thu Jul 20 00:52:30 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4R5vKq1J6mz4mxD9; Thu, 20 Jul 2023 00:52:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R5vKq0G0vz3Mx9; Thu, 20 Jul 2023 00:52:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689814351; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4mGRQmDOVV15KM+DMZUGE/PN0GnJLgR869IdyJTCGYA=; b=cqRk8NrBL0BgIJoF12h/3K8qv/OG8EkXf9QBIs0uCYwn60GoC+ALl0T26VvhL8CIMEc00f QX33vPypO+/oreDnRsH29qp7LGtPkOdyugtjrz3DaNL5aMRlRpKvv3mQLLMU3F42KrVMM3 vKj38XfNCRy/oA41hLaDJDc7w2cLoIvY/XGb3c0kkRFRh+ElrIGVeZXg0ldzXEx2nufZ1d I/cZk+Gu9XLgcZaJu4s0YgDCwl1g0gCPek+rM//KtrlmqJt5MXzGRkTqtsqy9fnV3XL82e dPPVz173VMl6zwix2vQmDFTsze/q8RRQ42kyyj4RI/4NzCiVg3R3iBo5GD2N+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689814351; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4mGRQmDOVV15KM+DMZUGE/PN0GnJLgR869IdyJTCGYA=; b=mCnUVjDVvIAY2IBFPSuy0raDzARG2NpZVisZ1Cp6dP50NJhQog4ciarkvfLNLd0uEWGSMn +R9ZZY0t+V/LfoI+evzNBspBsFm/Gl9A6z7GqHw3KE1QswiCk2bAJr2l5JFW/5Ajh92L7H 3ekZ+1ULiLi/kammkBHkuePT4ocvkSw1MqBlZxmdS6QFtCYC60mhbYvUHpI5RMcXb45LPt Si+G1WzhdojAXXUvDQUSQatgXZV8P90SIGGlz+V7NeYDDly6u2wvm1R4ItXWmxnteSgDG4 PR73SYn4DdiHb+ZA/Nm7eB73k1hhli7s1JDYhWDiJqzQExOHn0ii/su3mZKh2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689814351; a=rsa-sha256; cv=none; b=UvdToa061shG1auKi6WvDiQZtkBzyOl5Z9EI+tOrJMbY11rnqpzJXRI24BjGbVAccZzYJj Kfcjd8Yn5wGwhS2MdQNl6dwo9c61O1m3hbVFL8xt3ZbV1KdwEjoahFiy3ofcmwcjgxwlJo ubiVmYSrJcR9zbPGIEG0DFaTTW1co5Wu/qVFrELKhxr5205oH/j2WKUEP/zcGZneFPdHSn p6AjlJw0mZzjZR90TBSWhgWmnddtdVKFBGZJKS1JEPciV53IhgF7Cp7ddWgkgcEOSB6QXm gMh0dd3YOz9XnInKR+7niDb23ed9HsvkqUA1tJGHz0NDNQPfSEn/QNWrMUHTrw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R5vKp5xmtz19Yh; Thu, 20 Jul 2023 00:52:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36K0qUBD062624; Thu, 20 Jul 2023 00:52:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36K0qUne062623; Thu, 20 Jul 2023 00:52:30 GMT (envelope-from git) Date: Thu, 20 Jul 2023 00:52:30 GMT Message-Id: <202307200052.36K0qUne062623@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 620b228da873 - 2023Q3 - graphics/mesa-devel: update to 23.2.0.b.320 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q3 X-Git-Reftype: branch X-Git-Commit: 620b228da873a3dc5e3d0ac4a18390006302b6a2 Auto-Submitted: auto-generated The branch 2023Q3 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=620b228da873a3dc5e3d0ac4a18390006302b6a2 commit 620b228da873a3dc5e3d0ac4a18390006302b6a2 Author: Jan Beich AuthorDate: 2023-07-19 23:28:31 +0000 Commit: Jan Beich 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);