From nobody Tue Aug 1 00:57:31 2023 X-Original-To: dev-commits-ports-branches@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 4RFH8p09jTz4pdqK; Tue, 1 Aug 2023 01:10:14 +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 4RFGt34JJ7z41HQ; Tue, 1 Aug 2023 00:57:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690851451; 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=29LcCkUEB8tnLXLAB+KYtmg842zML6GOb1lUuDyCGKo=; b=MOlC6sa6bSUwLEKlVWF+u8yUEyRQfa3Vl44M64C/43qsoiKr8gZ7iHQfMzl4UZE71R7n8c TSGNwUyZHFgAwQd5SuQeORQJH7i+R9/SR7gztABpqRfPQVUe4Ow0fi3U+V2jgydtPgtpB2 eGkV/EjxlExfnL5PP58SgeasMoiI4VHki0p3gIGBw5En1t19Ib3t9h9cCLM7bhBN4owmFb 1vYjwvv8i2GO28DIW0BKBk8PPo3qPLfP3QK+M1ic9JEWxsL856Pootgof/qcbaLWThrPbi 1sGe+fLdLvKNBsloXBh81OpiHjf6Nz9tRHjjhWpwa1T5lUAig1RsU8bnEyg4EA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690851451; 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=29LcCkUEB8tnLXLAB+KYtmg842zML6GOb1lUuDyCGKo=; b=PfSVZJl+p4TilxepbOPzxKKPyHqG2A3nIZ13W9opqa1rD44MieCVLCMC6HeUPAk/jSEYfE TR4jgYPCV/o1yLYUcBm3q8dKG0qFM23gCq4SFA8HqE/7ai6NTXnfSsRL5yQGNpdskE5DAV unF7Iw5dFst+ahh3kc76YzLTfRFNVVP7XBa0HSSqnTLDAJSUQWq2XEua6iQSkNX5ZdDptT hq/v6uvgPt799LPkzipi8Pqi6u/fnOjYTtfSBCmV/sqQt4LZRnrYQaV404n8QbuKEIjabK qHGHuyb360jiFJ2uwgRhtCZyn6VClGkRGlmcX6UygfOyze4jNjNsEQgto9PQog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690851451; a=rsa-sha256; cv=none; b=F9J1A6gR8K7XS4IspD2An4bccxP5Dk4cnDZaVop2e4d8CL9GTF/I1GJxF0H0MCl/SfS7WH eiUWs+JxsYgB83NbQ4lscMgwltbcy3tp61sSo+xfNlyJat90WFSCq+IeslpWC5mIIb68dK zTkzMRbLvlSWyxcTLntZI6eNfsd/h7QFnnJK9Kk1TRDueTDuKBRa8Zhk2/afAFy1wWcpKn covsx79l1uAzg7EyT4yb79h+gHuW6QNhCx9veHpc/hz41/a5l/IqRbh5ewuvP7uXffgh/W iPGhGljcUORt9YyYkYJrIQQhnEQWnpNrZK5fxSB4v//+8/Py+ckaAPGvD4qivg== 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 4RFGt32Wp1zHwX; Tue, 1 Aug 2023 00:57:31 +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 3710vVv0007180; Tue, 1 Aug 2023 00:57:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3710vV25007179; Tue, 1 Aug 2023 00:57:31 GMT (envelope-from git) Date: Tue, 1 Aug 2023 00:57:31 GMT Message-Id: <202308010057.3710vV25007179@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: 606e4b71accf - 2023Q3 - graphics/mesa-devel: update to 23.2.0.b.806 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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: 606e4b71accfd7b534a5c65b3a253635c182c1af Auto-Submitted: auto-generated The branch 2023Q3 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=606e4b71accfd7b534a5c65b3a253635c182c1af commit 606e4b71accfd7b534a5c65b3a253635c182c1af Author: Jan Beich AuthorDate: 2023-07-31 18:56:34 +0000 Commit: Jan Beich CommitDate: 2023-08-01 00:48:34 +0000 graphics/mesa-devel: update to 23.2.0.b.806 Changes: https://gitlab.freedesktop.org/mesa/mesa/-/compare/5df97c27dc8...c9b2f83a2fb (cherry picked from commit f6493e8ca12705b1f9a3cacd11aeb5734a8f5994) --- 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,