1 files changed, 54 insertions, 0 deletions
diff --git a/graphics/nvidia-drm-latest-kmod/files/extra-patch-nvidia-drm-freebsd-lkpi.c b/graphics/nvidia-drm-latest-kmod/files/extra-patch-nvidia-drm-freebsd-lkpi.c
new file mode 100644
index 000000000000..807e95effe74
--- /dev/null
+++ b/graphics/nvidia-drm-latest-kmod/files/extra-patch-nvidia-drm-freebsd-lkpi.c
@@ -0,0 +1,54 @@
+--- 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[i] = 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);