From owner-svn-ports-all@freebsd.org Thu Mar 11 00:20:39 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C8EC357C138; Thu, 11 Mar 2021 00:20:39 +0000 (UTC) (envelope-from jbeich@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 4DwqNR5F3Lz4tsC; Thu, 11 Mar 2021 00:20:39 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A69F51ACA1; Thu, 11 Mar 2021 00:20:39 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 12B0Kdhp071548; Thu, 11 Mar 2021 00:20:39 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 12B0Kd7Z070787; Thu, 11 Mar 2021 00:20:39 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202103110020.12B0Kd7Z070787@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 11 Mar 2021 00:20:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r568057 - in branches/2021Q1/graphics/mesa-devel: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2021Q1/graphics/mesa-devel: . files X-SVN-Commit-Revision: 568057 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Mar 2021 00:20:39 -0000 Author: jbeich Date: Thu Mar 11 00:20:38 2021 New Revision: 568057 URL: https://svnweb.freebsd.org/changeset/ports/568057 Log: MFH: r567880 r568056 graphics/mesa-devel: update to 21.0.b.2806 Changes: https://gitlab.freedesktop.org/mesa/mesa/-/compare/24ce0862fe0...c22267262ee Modified: branches/2021Q1/graphics/mesa-devel/Makefile branches/2021Q1/graphics/mesa-devel/distinfo branches/2021Q1/graphics/mesa-devel/files/patch-userptr Directory Properties: branches/2021Q1/ (props changed) Modified: branches/2021Q1/graphics/mesa-devel/Makefile ============================================================================== --- branches/2021Q1/graphics/mesa-devel/Makefile Thu Mar 11 00:10:31 2021 (r568056) +++ branches/2021Q1/graphics/mesa-devel/Makefile Thu Mar 11 00:20:38 2021 (r568057) @@ -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 Modified: branches/2021Q1/graphics/mesa-devel/distinfo ============================================================================== --- branches/2021Q1/graphics/mesa-devel/distinfo Thu Mar 11 00:10:31 2021 (r568056) +++ branches/2021Q1/graphics/mesa-devel/distinfo Thu Mar 11 00:20:38 2021 (r568057) @@ -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 Modified: branches/2021Q1/graphics/mesa-devel/files/patch-userptr ============================================================================== --- branches/2021Q1/graphics/mesa-devel/files/patch-userptr Thu Mar 11 00:10:31 2021 (r568056) +++ branches/2021Q1/graphics/mesa-devel/files/patch-userptr Thu Mar 11 00:20:38 2021 (r568057) @@ -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;