525.47.06

kernel-open/conftest.sh

@@ -1059,6 +1059,23 @@ compile_test() {
             compile_check_conftest "$CODE" "NV_MDEV_DRIVER_HAS_SUPPORTED_TYPE_GROUPS" "" "types"
         ;;
 
+        vfio_device_ops_has_dma_unmap)
+            #
+            # Determine if 'vfio_device_ops' struct has 'dma_unmap' field.
+            #
+            # Added by commit ce4b4657ff18 ("vfio: Replace the DMA unmapping
+            # notifier with a callback") in v6.0
+            #
+            CODE="
+            #include <linux/pci.h>
+            #include <linux/vfio.h>
+            int conftest_vfio_device_ops_has_dma_unmap(void) {
+                return offsetof(struct vfio_device_ops, dma_unmap);
+            }"
+
+            compile_check_conftest "$CODE" "NV_VFIO_DEVICE_OPS_HAS_DMA_UNMAP" "" "types"
+        ;;
+
         pci_irq_vector_helpers)
             #
             # Determine if pci_alloc_irq_vectors(), pci_free_irq_vectors()
@@ -2611,7 +2628,7 @@ compile_test() {
             fi
         ;;
 
-        vfio_pin_pages)
+        vfio_pin_pages_has_vfio_device_arg)
             #
             # Determine if vfio_pin_pages() kABI accepts "struct vfio_device *"
             # argument instead of "struct device *"
@@ -2642,6 +2659,37 @@ compile_test() {
             fi
         ;;
 
+        vfio_pin_pages_has_pages_arg)
+            #
+            # Determine if vfio_pin_pages() kABI accepts "struct pages **:
+            # argument instead of "unsigned long *phys_pfn"
+            #
+            # Replaced "unsigned long *phys_pfn" with "struct pages **pages"
+            # in commit 34a255e676159 ("vfio: Replace phys_pfn with pages for
+            # vfio_pin_pages()") in v6.0.
+            #
+            echo "$CONFTEST_PREAMBLE
+            #include <linux/pci.h>
+            #include <linux/vfio.h>
+            int vfio_pin_pages(struct vfio_device *device,
+                               dma_addr_t iova,
+                               int npage,
+                               int prot,
+                               struct page **pages) {
+                return 0;
+            }" > conftest$$.c
+
+            $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
+            rm -f conftest$$.c
+
+            if [ -f conftest$$.o ]; then
+                echo "#define NV_VFIO_PIN_PAGES_HAS_PAGES_ARG" | append_conftest "functions"
+                rm -f conftest$$.o
+            else
+                echo "#undef NV_VFIO_PIN_PAGES_HAS_PAGES_ARG" | append_conftest "functions"
+            fi
+        ;;
+
         pci_driver_has_driver_managed_dma)
             #
             # Determine if "struct pci_driver" has .driver_managed_dma member.
@@ -5404,6 +5452,28 @@ compile_test() {
             compile_check_conftest "$CODE" "NV_ACPI_VIDEO_BACKLIGHT_USE_NATIVE" "" "functions"
         ;;
 
+        drm_connector_has_override_edid)
+            #
+            # Determine if 'struct drm_connector' has an 'override_edid' member.
+            #
+            # Removed by commit 90b575f52c6ab ("drm/edid: detach debugfs EDID
+            # override from EDID property update") in linux-next, expected in
+            # v6.2-rc1.
+            #
+            CODE="
+            #if defined(NV_DRM_DRM_CRTC_H_PRESENT)
+            #include <drm/drm_crtc.h>
+            #endif
+            #if defined(NV_DRM_DRM_CONNECTOR_H_PRESENT)
+            #include <drm/drm_connector.h>
+            #endif
+            int conftest_drm_connector_has_override_edid(void) {
+                return offsetof(struct drm_connector, override_edid);
+            }"
+
+            compile_check_conftest "$CODE" "NV_DRM_CONNECTOR_HAS_OVERRIDE_EDID" "" "types"
+        ;;
+
         # When adding a new conftest entry, please use the correct format for
         # specifying the relevant upstream Linux kernel commit.
         #