From nobody Fri Dec 29 19:29:04 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 4T1wRP1Qmzz5538Y; Fri, 29 Dec 2023 19:29:05 +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 4T1wRN6qlXz3KrV; Fri, 29 Dec 2023 19:29:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703878145; 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=C7PREyKrQ1b0NNEJxtrrsD0Ts0C86rrLtYJcnljHFy8=; b=p9D6qXRoWsIAgVcVsO1d4gG44Wj3bsK/nu0axWSmNyrccVEkkwj/qzonKLSjYacTGEyV2n vVt6oGkp8BCh/oPN8tHjmgY9LbAfGP4b1GcAV5JmCO28vUGvI/n0ohIcMFExYh411rvS5c Vx7BGZIiFOkP47C/gl0praTzOPJF5W2AjXgBh9iSzgurbqCgbR291lEc9AkDKVjRYLjMsx ZHGRZVSJshZ9Rfya2elpiclPhxuln8IDMvXQfbF22gCpnNlFL5zq0AubFgtOnsHQYvlcn8 z+EkPmhKfqck3oskgDitskcSoXZzEP+frQzyooNAP1Mnnc5K8i8hSiMtrS0CNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703878145; a=rsa-sha256; cv=none; b=ePpyjat8H0vKsnA62mx1mp8ov99WfpyCB15y+QV6dYo7ARCgtRYPWhIxVOCctra7yNGXve giyDYYr4ysI+AjiIuSVwRZ2BBgVZWcpkz2ANUudTkbejjINmUV9RswYmbECJXZXhwRLPLG COoSCzWaktPfv+l+/zCkvhXs0spBTC8Bmznl2F/W5Qh4inWM1XtQ7TIlp5n7JL74J4Uc9V mIHjfV6ftSkBR7xw8rV8f4c0fSFF2vFD0jHFrbNyFRkRfEHgIEy1lb7Ly4PqmdtmBTx6VB Z2PaF2LdyjY6bn5dqqxQjYqwE20+kzYEBc5LXNXnj2v7MkohwUp3tiDg9IirvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703878145; 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=C7PREyKrQ1b0NNEJxtrrsD0Ts0C86rrLtYJcnljHFy8=; b=eHevESNDeFJQ1GCh15dYIiP5WXpMjB8RxJKXNt0bvb6Dy6OUp7XwTYJvUYX6yeftP+pt6f sm36MrePc2NfFuS44HekIw4t7iKHItzOjp06iOBCnUdFAmuBQqFfzMoIKGnogc5FXmpQSd H27nIcTs1eIrg7oTZoaZZhNEFTBt8G87upJYbJ+ncoRHkVRF670gq3BD8o5xtXpVqhBIjE aLmqfJET/KAmVpNFa9n7NS5FefjnMewXlGmM41BRg7FDipFup8y8YQY1Ded1vXi7KwTN+Q 3t/9CqAxxrzYYGwoRJJvkNZV/tMEjAxERPttnZuFBmGh5kO9+6Im/LfKygz58A== 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 4T1wRN5tXPz4D0; Fri, 29 Dec 2023 19:29:04 +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 3BTJT4xZ005088; Fri, 29 Dec 2023 19:29:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BTJT4AE005085; Fri, 29 Dec 2023 19:29:04 GMT (envelope-from git) Date: Fri, 29 Dec 2023 19:29:04 GMT Message-Id: <202312291929.3BTJT4AE005085@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Emmanuel Vadot Subject: git: fe705ac08744 - main - graphics/nvidia-drm-515-kmod: Fix build on CURRENT with iosys-map.h 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: manu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fe705ac087444001315552af0c72cf39854eb1d5 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=fe705ac087444001315552af0c72cf39854eb1d5 commit fe705ac087444001315552af0c72cf39854eb1d5 Author: Austin Shafer AuthorDate: 2023-12-29 19:28:07 +0000 Commit: Emmanuel Vadot CommitDate: 2023-12-29 19:28:07 +0000 graphics/nvidia-drm-515-kmod: Fix build on CURRENT with iosys-map.h Commit f8ab2f5bae1d added the linux/iosys-map.h header to base in order to support 5.18+ versions of drm-kmod. This messes with nvidia-drm's conftest logic as on recent enough CURRENT versions it will see iosys-map and assume it can use it, but the drm-kmod version in use is 5.15, which wants to use the older dma_buf_map. This adds a patch on the port side to override nvidia-drm's detector and force the use of dma_buf_map on the 5.15 port. Differential Revision: https://reviews.freebsd.org/D43234 --- .../nvidia-drm-515-kmod/files/patch-nvidia-drm-gem.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/graphics/nvidia-drm-515-kmod/files/patch-nvidia-drm-gem.c b/graphics/nvidia-drm-515-kmod/files/patch-nvidia-drm-gem.c new file mode 100644 index 000000000000..5693b76d27c4 --- /dev/null +++ b/graphics/nvidia-drm-515-kmod/files/patch-nvidia-drm-gem.c @@ -0,0 +1,18 @@ +--- nvidia-drm-gem.c.orig 2023-12-29 19:08:23 UTC ++++ nvidia-drm-gem.c +@@ -68,15 +68,7 @@ void nv_drm_gem_free(struct drm_gem_object *gem) + #if !defined(NV_DRM_DRIVER_HAS_GEM_PRIME_CALLBACKS) && \ + defined(NV_DRM_GEM_OBJECT_VMAP_HAS_MAP_ARG) + +-/* +- * The 'dma_buf_map' structure is renamed to 'iosys_map' by the commit +- * 7938f4218168 ("dma-buf-map: Rename to iosys-map"). +- */ +-#if defined(NV_LINUX_IOSYS_MAP_H_PRESENT) +-typedef struct iosys_map nv_sysio_map_t; +-#else + typedef struct dma_buf_map nv_sysio_map_t; +-#endif + + static int nv_drm_gem_vmap(struct drm_gem_object *gem, + nv_sysio_map_t *map)