I usually refrain from altering records, in this case I created separate code blocks and faked the appearance of command prompts at the end of each block.
The patched file /usr/ports/graphics/nvidia-drm-61-kmod/files/patch-nvidia-drm-conftest.h should look like this.
--- nvidia-drm-conftest.h.orig 2024-02-22 01:03:15 UTC
+++ nvidia-drm-conftest.h
@@ -85,7 +85,11 @@
/* For nv_drm_gem_prime_force_fence_signal */
#ifndef spin_is_locked
+#if ((__FreeBSD_version >= 1500000) && (__FreeBSD_version < 1500018)) || (__FreeBSD_version < 1401501)
#define spin_is_locked(lock) mtx_owned(lock.m)
+#else
+#define spin_is_locked(lock) mtx_owned(lock)
+#endif
#endif
#ifndef rwsem_is_lockedroot@marietto:/usr/ports/graphics/nvidia-drm-61-kmod # make
===> Patching for nvidia-drm-61-kmod-560.28.03_1
===> Applying FreeBSD patches for nvidia-drm-61-kmod-560.28.03_1 from /usr/ports/graphics/nvidia-drm-61-kmod/files
patch: **** malformed patch at line 12: #endif
===> FAILED Applying FreeBSD patch-nvidia-drm-conftest.h_
===> Cleanly applied FreeBSD patch(es) patch-nvidia-drm-conftest.h
===> FAILED to apply cleanly FreeBSD patch(es) patch-nvidia-drm-conftest.h_
*** Error code 1root@marietto:/usr/ports/graphics/nvidia-drm-61-kmod/files # mv patch-nvidia-drm-conftest.h_ patch-nvidia-drm-conftest.no
root@marietto:/usr/ports/graphics/nvidia-drm-61-kmod # make install
===> Patching for nvidia-drm-61-kmod-560.28.03_1
===> Applying FreeBSD patches for nvidia-drm-61-kmod-560.28.03_1 from /usr/ports/graphics/nvidia-drm-61-kmod/files
Ignoring previously applied (or reversed) patch.
1 out of 1 hunks ignored--saving rejects to nvidia-drm-conftest.h.rej
===> FAILED Applying FreeBSD patch-nvidia-drm-conftest.h
===> FAILED to apply cleanly FreeBSD patch(es) patch-nvidia-drm-conftest.h
*** Error code 1root@marietto:/usr/ports/graphics/nvidia-drm-61-kmod/files # mv *.no ..
root@marietto:/usr/ports/graphics/nvidia-drm-61-kmod # make clean
===> Cleaning for nvidia-drm-61-kmod-560.28.03_1
root@marietto:/usr/ports/graphics/nvidia-drm-61-kmod # make
===> License NVIDIA accepted by the user
===> nvidia-drm-61-kmod-560.28.03_1 depends on file: /usr/local/sbin/pkg - found
===> Fetching all distfiles required by nvidia-drm-61-kmod-560.28.03_1 for building
===> Extracting for nvidia-drm-61-kmod-560.28.03_1
=> SHA256 Checksum OK for NVIDIA-FreeBSD-x86_64-560.28.03.tar.xz.
=> SHA256 Checksum OK for freebsd-drm-kmod-drm_v6.1.92_0_GH0.tar.gz.
===> Patching for nvidia-drm-61-kmod-560.28.03_1
===> Applying FreeBSD patches for nvidia-drm-61-kmod-560.28.03_1 from /usr/ports/graphics/nvidia-drm-61-kmod/files
Ignoring previously applied (or reversed) patch.
3 out of 3 hunks ignored--saving rejects to nvidia-drm-freebsd-lkpi.c.rej
===> FAILED Applying FreeBSD patch-nvidia-drm-freebsd-lkpi.c
===> Cleanly applied FreeBSD patch(es) patch-nvidia-drm-conftest.h
===> FAILED to apply cleanly FreeBSD patch(es) patch-nvidia-drm-freebsd-lkpi.c
*** Error code 1It is the one I've pointed as D45400.
extra-.origextra-, this is reserved for coditionally applicable patches. Each ports Makefile is responsible to handle it for cases it should be applied.
PORTNAME= nvidia-drm-61-kmod
PORTREVISION= 1
CATEGORIES= graphics
BUILD_DEPENDS+= ${KMODDIR}/drm.ko:graphics/drm-61-kmod
RUN_DEPENDS+= ${KMODDIR}/drm.ko:graphics/drm-61-kmod
CONFLICTS_INSTALL= nvidia-drm-510-kmod nvidia-drm-515-kmod
.include "${.CURDIR}/../drm-61-kmod/Makefile.version"
.include "${.CURDIR}/../nvidia-drm-kmod/Makefile.common"
.include <bsd.port.mk>PORTNAME= nvidia-drm-kmod
PORTVERSION= ${NVIDIA_DISTVERSION}
CATEGORIES= graphics kld
MAINTAINER= ashafer@badland.io
COMMENT= NVIDIA DRM Kernel Module
WWW= https://www.nvidia.com/object/unix.html
USES= metaport
.include "${.CURDIR}/../../x11/nvidia-driver/Makefile.version"
.include <bsd.port.pre.mk>
.if ${OPSYS} != FreeBSD
IGNORE= not supported on anything but FreeBSD (missing linuxkpi functionality)
.else
. if ${OSVERSION} >= 1302000 && ${OSVERSION} < 1400097
RUN_DEPENDS+= ${KMODDIR}/nvidia-drm.ko:graphics/nvidia-drm-510-kmod
. elif ${OSVERSION} >= 1400097 && (${ARCH} == i386 || ${ARCH} == aarch64)
RUN_DEPENDS+= ${KMODDIR}/nvidia-drm.ko:graphics/nvidia-drm-510-kmod
. elif ${OSVERSION} >= 1400097 && ${OSVERSION} < 1400508
RUN_DEPENDS+= ${KMODDIR}/nvidia-drm.ko:graphics/nvidia-drm-515-kmod
. elif ${OSVERSION} >= 1400508
RUN_DEPENDS+= ${KMODDIR}/nvidia-drm.ko:graphics/nvidia-drm-61-kmod
. endif
.endif
.include <bsd.port.post.mk>root@marietto:/usr/ports/graphics/nvidia-drm-61-kmod # make
===> License NA accepted by the user
===> nvidia-drm-kmod-560.28.03 depends on file: /usr/local/sbin/pkg - found
===> Fetching all distfiles required by nvidia-drm-kmod-560.28.03 for building
===> Extracting for nvidia-drm-kmod-560.28.03
===> Patching for nvidia-drm-kmod-560.28.03
===> Applying FreeBSD patches for nvidia-drm-kmod-560.28.03 from /usr/ports/graphics/nvidia-drm-61-kmod/files
patch: **** can't cd to /usr/ports/graphics/nvidia-drm-61-kmod/work/nvidia-drm-kmod-560.28.03: No such file or directory
===> FAILED Applying FreeBSD patch-nvidia-drm-conftest.h
===> FAILED to apply cleanly FreeBSD patch(es) patch-nvidia-drm-conftest.h
*** Error code 1One thing I can say is that you're confusing graphics/nvidia-drm-61-kmod port and graphics/nvidia-drm-kmod port.Should I patch files graphics/nvidia-drm-kmod/Makefile and graphics/nvidia-drm-kmod/Makefile.common ? I see that mine are different from the ones showed here :
R11:307f75413336
reviews.freebsd.org
my Makefile :
Code:PORTNAME= nvidia-drm-61-kmod PORTREVISION= 1 CATEGORIES= graphics BUILD_DEPENDS+= ${KMODDIR}/drm.ko:graphics/drm-61-kmod RUN_DEPENDS+= ${KMODDIR}/drm.ko:graphics/drm-61-kmod CONFLICTS_INSTALL= nvidia-drm-510-kmod nvidia-drm-515-kmod .include "${.CURDIR}/../drm-61-kmod/Makefile.version" .include "${.CURDIR}/../nvidia-drm-kmod/Makefile.common" .include <bsd.port.mk>
patched Makefile should be like this :
Code:PORTNAME= nvidia-drm-kmod PORTVERSION= ${NVIDIA_DISTVERSION} CATEGORIES= graphics kld MAINTAINER= ashafer@badland.io COMMENT= NVIDIA DRM Kernel Module WWW= https://www.nvidia.com/object/unix.html USES= metaport .include "${.CURDIR}/../../x11/nvidia-driver/Makefile.version" .include <bsd.port.pre.mk> .if ${OPSYS} != FreeBSD IGNORE= not supported on anything but FreeBSD (missing linuxkpi functionality) .else . if ${OSVERSION} >= 1302000 && ${OSVERSION} < 1400097 RUN_DEPENDS+= ${KMODDIR}/nvidia-drm.ko:graphics/nvidia-drm-510-kmod . elif ${OSVERSION} >= 1400097 && (${ARCH} == i386 || ${ARCH} == aarch64) RUN_DEPENDS+= ${KMODDIR}/nvidia-drm.ko:graphics/nvidia-drm-510-kmod . elif ${OSVERSION} >= 1400097 && ${OSVERSION} < 1400508 RUN_DEPENDS+= ${KMODDIR}/nvidia-drm.ko:graphics/nvidia-drm-515-kmod . elif ${OSVERSION} >= 1400508 RUN_DEPENDS+= ${KMODDIR}/nvidia-drm.ko:graphics/nvidia-drm-61-kmod . endif .endif .include <bsd.port.post.mk>
I don't even have any Makefile.common.
root@marietto:/usr/ports/graphics/nvidia-drm-61-kmod # make clean
===> Cleaning for nvidia-drm-61-kmod-560.28.03_1
root@marietto:/usr/ports/graphics/nvidia-drm-61-kmod # make
===> License NVIDIA accepted by the user
===> nvidia-drm-61-kmod-560.28.03_1 depends on file: /usr/local/sbin/pkg - found
===> Fetching all distfiles required by nvidia-drm-61-kmod-560.28.03_1 for building
===> Extracting for nvidia-drm-61-kmod-560.28.03_1
=> SHA256 Checksum OK for NVIDIA-FreeBSD-x86_64-560.28.03.tar.xz.
=> SHA256 Checksum OK for freebsd-drm-kmod-drm_v6.1.92_0_GH0.tar.gz.
===> Patching for nvidia-drm-61-kmod-560.28.03_1
===> Applying FreeBSD patches for nvidia-drm-61-kmod-560.28.03_1 from /usr/ports/graphics/nvidia-drm-61-kmod/files
Ignoring previously applied (or reversed) patch.
3 out of 3 hunks ignored--saving rejects to nvidia-drm-freebsd-lkpi.c.rej
===> FAILED Applying FreeBSD patch-nvidia-drm-freebsd-lkpi.c
===> Cleanly applied FreeBSD patch(es) patch-nvidia-drm-conftest.h
===> FAILED to apply cleanly FreeBSD patch(es) patch-nvidia-drm-freebsd-lkpi.c
*** Error code 1
Stop.--- nvidia-drm-freebsd-lkpi.c.orig 2024-02-22 01:03:15 UTC
+++ nvidia-drm-freebsd-lkpi.c
@@ -115,6 +115,7 @@ int nv_drm_probe_devices(void)
* by the native nvidia.ko by using our devclass.
*/
for (int i = 0; i < NV_MAX_DEVICES; i++) {
+ struct pci_dev *pdev;
nv_gpu_info_t gpu_info;
struct nvidia_softc *sc = devclass_get_softc(nvidia_devclass, i);
if (!sc) {
@@ -124,11 +125,33 @@ int nv_drm_probe_devices(void)
nv_state_t *nv = sc->nv_state;
/*
+ * Set the ivars for this device if they are not already populated. This
+ * is the bus specific data, and linuxkpi will try to use it.
+ */
+ if (!device_get_ivars(sc->dev)) {
+ device_t parent = device_get_parent(sc->dev);
+ struct pci_devinfo *dinfo = device_get_ivars(parent);
+ device_set_ivars(sc->dev, dinfo);
+ }
+
+ /*
* Now we have the state (which gives us the device_t), but what nvidia-drm
* wants is a pci_dev suitable for use with linuxkpi code. We can use
- * lkpinew_pci_dev to fill in a pci_dev struct,
+ * lkpinew_pci_dev to fill in a pci_dev struct, or linux_pci_attach on more
+ * recent kernels (introduced by 253dbe7487705).
*/
- struct pci_dev *pdev = lkpinew_pci_dev(sc->dev);
+#if __FreeBSD_version < 1300093
+ pdev = lkpinew_pci_dev(sc->dev);
+#else
+ pdev = malloc(sizeof(*pdev), M_DEVBUF, M_WAITOK|M_ZERO);
+ if (!pdev) {
+ return -ENOMEM;
+ }
+
+ if (linux_pci_attach_device(sc->dev, NULL, NULL, pdev)) {
+ return -ENOMEM;
+ }
+#endif
nv_lkpi_pci_devs = pdev;
gpu_info.gpu_id = nv->gpu_id;
@@ -148,7 +171,6 @@ MODULE_DEPEND(nvidia_drm, linuxkpi, 1, 1, 1);
LKPI_DRIVER_MODULE(nvidia_drm, nv_drm_init, nv_drm_exit);
LKPI_PNP_INFO(pci, nvidia_drm, nv_module_device_table);
MODULE_DEPEND(nvidia_drm, linuxkpi, 1, 1, 1);
-MODULE_DEPEND(nvidia_drm, linuxkpi_gplv2, 1, 1, 1);
MODULE_DEPEND(nvidia_drm, drmn, 2, 2, 2);
MODULE_DEPEND(nvidia_drm, dmabuf, 1, 1, 1);
MODULE_DEPEND(nvidia_drm, nvidia, 1, 1, 1);Again, if you're on current state of (main branch) ports tree (or old tree but applying properly the patch on Phablicator Differential Revision D45400 [same as you mentioned]), patch-nvidia-drm-freebsd-lkpi.c no longer exists. it's renamed to extra-patch-nvidia-drm-freebsd-lkpi.c and applied conditionally only when needed.Ok sorry my bad. Here we have a very hot temperature. That's right. I've modified Makefile and Makefile.common inside the dir : /usr/ports/graphics/nvidia-drm-kmod according with how they should be,as shown here :
R11:307f75413336
and I tried to compile nvidia-drm-61-kmod again :
Code:root@marietto:/usr/ports/graphics/nvidia-drm-61-kmod # make clean ===> Cleaning for nvidia-drm-61-kmod-560.28.03_1 root@marietto:/usr/ports/graphics/nvidia-drm-61-kmod # make ===> License NVIDIA accepted by the user ===> nvidia-drm-61-kmod-560.28.03_1 depends on file: /usr/local/sbin/pkg - found ===> Fetching all distfiles required by nvidia-drm-61-kmod-560.28.03_1 for building ===> Extracting for nvidia-drm-61-kmod-560.28.03_1 => SHA256 Checksum OK for NVIDIA-FreeBSD-x86_64-560.28.03.tar.xz. => SHA256 Checksum OK for freebsd-drm-kmod-drm_v6.1.92_0_GH0.tar.gz. ===> Patching for nvidia-drm-61-kmod-560.28.03_1 ===> Applying FreeBSD patches for nvidia-drm-61-kmod-560.28.03_1 from /usr/ports/graphics/nvidia-drm-61-kmod/files Ignoring previously applied (or reversed) patch. 3 out of 3 hunks ignored--saving rejects to nvidia-drm-freebsd-lkpi.c.rej ===> FAILED Applying FreeBSD patch-nvidia-drm-freebsd-lkpi.c ===> Cleanly applied FreeBSD patch(es) patch-nvidia-drm-conftest.h ===> FAILED to apply cleanly FreeBSD patch(es) patch-nvidia-drm-freebsd-lkpi.c *** Error code 1 Stop.
Are you sure that you're not trying to apply a patch that's already there? Or maybe your patch is whitespace damaged? Did you try to apply it using "-l" ?
As noted on my previous comment, the file should not exist.
This is exactly what happenes when attempting to upgrade graphics/nvidia-drm-*-kmod ports to non-default version, which neither ashafer ( the maintainer of graphics/nvidia-drm*-kmod ports) nor I could figure out and fix.
# NVIDIA Distversion
#
# This will be included from x11/nvidia-driver and the nvidia-drm port
NVIDIA_DISTVERSION ?= 560.28.03Kernel modules like nvidia-drm.ko, nvidia-modeset.ko and nvidia.ko works with kernel which the modules are built upon (with the src tree the base is built with). If you are lucky enough, would run on newer kernel if its ABI is 100% kept.
First of all, NO PORTS Makefile (without filename extention) WHICH CONTAINS SINGLE
DISTVERSION?= 560.28.03 LINE ONLY WORKS.