From owner-svn-ports-all@freebsd.org Sun Mar 7 02:07:49 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 982E0553F4C; Sun, 7 Mar 2021 02:07:49 +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 4DtPxx3wHTz3R0b; Sun, 7 Mar 2021 02:07:49 +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 6ED4E6220; Sun, 7 Mar 2021 02:07:49 +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 12727nbN099479; Sun, 7 Mar 2021 02:07:49 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 12727nP8099478; Sun, 7 Mar 2021 02:07:49 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202103070207.12727nP8099478@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 7 Mar 2021 02:07:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r567535 - in branches/2021Q1/emulators/rpcs3: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2021Q1/emulators/rpcs3: . files X-SVN-Commit-Revision: 567535 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: Sun, 07 Mar 2021 02:07:49 -0000 Author: jbeich Date: Sun Mar 7 02:07:48 2021 New Revision: 567535 URL: https://svnweb.freebsd.org/changeset/ports/567535 Log: MFH: r567534 emulators/rpcs3: unbreak Vulkan on Intel after r562625 ioctl(I915_GEM_USERPTR) failed. Try running as root but expect poor stability. F {RSX [0x000255c]} SIG: Thread terminated due to fatal error: Assertion Failed! Vulkan API call failed with unrecoverable error: Invalid external handle (VK_ERROR_INVALID_EXTERNAL_HANDLE_KHR) (in file rpcs3/Emu/RSX/VK/vkutils/memory.cpp:224[:79], in function memory_block_host) (errno=1) (in file rpcs3/Emu/RSX/VK/vkutils/shared.cpp:103[:4], in function die_with_error) (errno=1) Added: branches/2021Q1/emulators/rpcs3/files/patch-userptr - copied unchanged from r567534, head/emulators/rpcs3/files/patch-userptr Modified: branches/2021Q1/emulators/rpcs3/Makefile Directory Properties: branches/2021Q1/ (props changed) Modified: branches/2021Q1/emulators/rpcs3/Makefile ============================================================================== --- branches/2021Q1/emulators/rpcs3/Makefile Sun Mar 7 02:06:51 2021 (r567534) +++ branches/2021Q1/emulators/rpcs3/Makefile Sun Mar 7 02:07:48 2021 (r567535) @@ -4,6 +4,7 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v DISTVERSION= 0.0.15-11838 # git rev-list --count HEAD DISTVERSIONSUFFIX= -g8e4451d1a +PORTREVISION= 1 CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org Copied: branches/2021Q1/emulators/rpcs3/files/patch-userptr (from r567534, head/emulators/rpcs3/files/patch-userptr) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2021Q1/emulators/rpcs3/files/patch-userptr Sun Mar 7 02:07:48 2021 (r567535, copy of r567534, head/emulators/rpcs3/files/patch-userptr) @@ -0,0 +1,15 @@ +VK_EXT_external_memory_host depends on userptr, so disable on Intel until +https://github.com/FreeBSDDesktop/kms-drm/issues/197 + +--- rpcs3/Emu/RSX/VK/VKDMA.cpp.orig 2021-02-28 23:32:23 UTC ++++ rpcs3/Emu/RSX/VK/VKDMA.cpp +@@ -264,7 +264,8 @@ namespace vk + true; + #else + // Anything running on AMDGPU kernel driver will not work due to the check for fd-backed memory allocations +- const bool allow_host_buffers = (vendor != driver_vendor::AMD && vendor != driver_vendor::RADV); ++ // Intel userptr on non-Linux may not work or require root ++ const bool allow_host_buffers = (vendor != driver_vendor::AMD && vendor != driver_vendor::RADV && vendor != driver_vendor::INTEL); + #endif + if (allow_host_buffers && g_render_device->get_external_memory_host_support()) + {