Quick fix for driver version 575 failures.

Author: elFarto

nvidia-include/nvidia-drm-ioctl.h

@@ -60,6 +60,10 @@
     DRM_IOWR((DRM_COMMAND_BASE + DRM_NVIDIA_GET_DEV_INFO),                 \
              struct drm_nvidia_get_dev_info_params_545)
 
+#define DRM_IOCTL_NVIDIA_GET_DEV_INFO_575                                  \
+    DRM_IOWR((DRM_COMMAND_BASE + DRM_NVIDIA_GET_DEV_INFO),                 \
+             struct drm_nvidia_get_dev_info_params_575)
+
 /*
  * XXX Solaris compiler has issues with DRM_IO. None of this is supported on
  * Solaris anyway, so just skip it.
@@ -155,6 +159,22 @@ struct drm_nvidia_get_dev_info_params_545 {
     uint32_t supports_semsurf;     /* OUT */
 };
 
+struct drm_nvidia_get_dev_info_params_575 {
+    uint32_t gpu_id;             /* OUT */
+    uint32_t mig_device;         /* OUT */
+    uint32_t primary_index;      /* OUT; the "card%d" value */
+
+    uint32_t supports_alloc;     /* OUT */
+    /* The generic_page_kind, page_kind_generation, and sector_layout
+     * fields are only valid if supports_alloc is true.
+     * See DRM_FORMAT_MOD_NVIDIA_BLOCK_LINEAR_2D definitions of these. */
+    uint32_t generic_page_kind;    /* OUT */
+    uint32_t page_kind_generation; /* OUT */
+    uint32_t sector_layout;        /* OUT */
+    uint32_t supports_sync_fd;     /* OUT */
+    uint32_t supports_semsurf;     /* OUT */
+};
+
 
 struct drm_nvidia_fence_context_create_params {
     uint32_t handle;            /* OUT GEM handle to fence context */

src/direct/nv-driver.c

@@ -239,7 +239,20 @@ static bool nv0_register_fd(const int nv0_fd, int nvctl_fd) {
 static bool get_device_info(const int fd, NVDriverContext *context) {
     //NVIDIA driver v545.29.02 changed the devInfo struct, and partly broke it in the process
     //...who adds a field to the middle of an existing struct....
-    if (context->driverMajorVersion >= 545 && context->driverMinorVersion >= 29) {
+    if (context->driverMajorVersion >= 575) {
+        struct drm_nvidia_get_dev_info_params_575 devInfo575;
+        const int ret = ioctl(fd, DRM_IOCTL_NVIDIA_GET_DEV_INFO_575, &devInfo575);
+
+        if (ret != 0) {
+            LOG("get_device_info failed: %d %d", ret, errno)
+            return false;
+        }
+
+        context->gpu_id = devInfo575.gpu_id;
+        context->sector_layout = devInfo575.sector_layout;
+        context->page_kind_generation = devInfo575.page_kind_generation;
+        context->generic_page_kind = devInfo575.generic_page_kind;
+    } else if (context->driverMajorVersion >= 545 && context->driverMinorVersion >= 29) {
         struct drm_nvidia_get_dev_info_params_545 devInfo545;
         const int ret = ioctl(fd, DRM_IOCTL_NVIDIA_GET_DEV_INFO_545, &devInfo545);
 
@@ -534,6 +547,9 @@ bool alloc_memory(const NVDriverContext *context, const uint32_t size, int *fd)
          }
      };
 
+     //TODO find the proper page size
+     imageSizeInBytes = ROUND_UP(imageSizeInBytes, 65536);
+
      struct drm_nvidia_gem_import_nvkms_memory_params params = {
          .mem_size = imageSizeInBytes,
          .nvkms_params_ptr = (uint64_t) &nvkmsParams,