580.95.05

Author: mmaneetsingh

README.md

@@ -79,7 +79,7 @@ ccflags-y += -I$(src)/common/inc
 ccflags-y += -I$(src)
 ccflags-y += -Wall $(DEFINES) $(INCLUDES) -Wno-cast-qual -Wno-format-extra-args
 ccflags-y += -D__KERNEL__ -DMODULE -DNVRM
-ccflags-y += -DNV_VERSION_STRING=\"580.82.09\"
+ccflags-y += -DNV_VERSION_STRING=\"580.95.05\"
 
 # Include and link Tegra out-of-tree modules.
 ifneq ($(wildcard /usr/src/nvidia/nvidia-oot),)

kernel-open/Kbuild

@@ -32,6 +32,8 @@ typedef struct {
         NvU8  bus, slot, function;
     } pci_info;
 
+    NvBool needs_numa_setup;
+
     /*
      * opaque OS-specific pointer; on Linux, this is a pointer to the
      * 'struct device' for the GPU.

kernel-open/common/inc/nv-gpu-info.h

@@ -1711,12 +1711,12 @@ static inline void nv_mutex_destroy(struct mutex *lock)
     mutex_destroy(lock);
 }
 
-static inline NvBool nv_platform_supports_numa(nv_linux_state_t *nvl)
+static inline NvBool nv_platform_supports_numa(const nv_linux_state_t *nvl)
 {
     return nvl->numa_info.node_id != NUMA_NO_NODE;
 }
 
-static inline int nv_get_numa_status(nv_linux_state_t *nvl)
+static inline int nv_get_numa_status(const nv_linux_state_t *nvl)
 {
     if (!nv_platform_supports_numa(nvl))
     {

kernel-open/common/inc/nv-linux.h

@@ -588,8 +588,8 @@ typedef struct nv_state_t
     /* Console is managed by drm drivers or NVKMS */
     NvBool client_managed_console;
 
-    /* Bool to check if power management is supported */
-    NvBool is_pm_supported;
+    /* Bool to check if power management is unsupported */
+    NvBool is_pm_unsupported;
 } nv_state_t;
 
 #define NVFP_TYPE_NONE       0x0

kernel-open/common/inc/nv.h

@@ -685,6 +685,9 @@ typedef struct UvmGpuInfo_tag
 
     // GPU supports Non-PASID ATS capability
     NvBool nonPasidAtsSupport;
+
+    // GPU setup in CDMM mode
+    NvBool cdmmEnabled;
 } UvmGpuInfo;
 
 typedef struct UvmGpuFbInfo_tag

kernel-open/common/inc/nv_uvm_types.h

@@ -667,7 +667,9 @@ enum NvKmsInputTf {
 enum NvKmsOutputColorimetry {
     NVKMS_OUTPUT_COLORIMETRY_DEFAULT = 0,
 
-    NVKMS_OUTPUT_COLORIMETRY_BT2100 = 1,
+    NVKMS_OUTPUT_COLORIMETRY_BT601 = 1,
+    NVKMS_OUTPUT_COLORIMETRY_BT709 = 2,
+    NVKMS_OUTPUT_COLORIMETRY_BT2100 = 3,
 };
 
 enum NvKmsOutputTf {

kernel-open/common/inc/nvkms-api-types.h

@@ -4856,6 +4856,22 @@ compile_test() {
             compile_check_conftest "$CODE" "NV_DRM_CONNECTOR_HELPER_FUNCS_MODE_VALID_HAS_CONST_MODE_ARG" "" "types"
         ;;
 
+        memory_device_coherent_present)
+            #
+            # Determine if MEMORY_DEVICE_COHERENT support is present or not
+            #
+            # Added by commit f25cbb7a95a2 ("mm: add zone device coherent type
+            # memory support") in v6.0.
+            #
+            CODE="
+            #include <linux/mm.h>
+            int memory_device_coherent = MEMORY_DEVICE_COHERENT;
+            "
+
+            compile_check_conftest "$CODE" "NV_MEMORY_DEVICE_COHERENT_PRESENT" "" "types"
+        ;;
+
+
         # When adding a new conftest entry, please use the correct format for
         # specifying the relevant upstream Linux kernel commit.  Please
         # avoid specifying -rc kernels, and only use SHAs that actually exist

kernel-open/conftest.sh

@@ -445,6 +445,14 @@ __nv_drm_connector_atomic_check(struct drm_connector *connector,
             req_config->modeSetConfig.colorimetry =
                 NVKMS_OUTPUT_COLORIMETRY_DEFAULT;
             break;
+        case DRM_MODE_COLORIMETRY_BT601_YCC:
+            req_config->modeSetConfig.colorimetry =
+                NVKMS_OUTPUT_COLORIMETRY_BT601;
+            break;
+        case DRM_MODE_COLORIMETRY_BT709_YCC:
+            req_config->modeSetConfig.colorimetry =
+                NVKMS_OUTPUT_COLORIMETRY_BT709;
+            break;
         case DRM_MODE_COLORIMETRY_BT2020_RGB:
         case DRM_MODE_COLORIMETRY_BT2020_YCC:
             // Ignore RGB/YCC

kernel-open/nvidia-drm/nvidia-drm-connector.c

@@ -691,7 +691,16 @@ static int nv_drm_dev_load(struct drm_device *dev)
     pDevice = nvKms->allocateDevice(&allocateDeviceParams);
 
     if (pDevice == NULL) {
-        NV_DRM_DEV_LOG_ERR(nv_dev, "Failed to allocate NvKmsKapiDevice");
+        if (nv_dev->gpu_info.needs_numa_setup) {
+            /*
+             * RM init from a kernel-mode driver may fail on GPUs that require
+             * NUMA setup. Just notify about that specifically rather than
+             * producing a scary-looking error.
+             */
+            NV_DRM_DEV_LOG_INFO(nv_dev, "NUMA was not set up yet; ignoring this device");
+        } else {
+            NV_DRM_DEV_LOG_ERR(nv_dev, "Failed to allocate NvKmsKapiDevice");
+        }
         return -ENODEV;
     }
 
@@ -787,6 +796,7 @@ static int nv_drm_dev_load(struct drm_device *dev)
         }
 #endif
         nvKms->freeDevice(nv_dev->pDevice);
+        NV_DRM_DEV_LOG_ERR(nv_dev, "Failed to create DRM properties");
         return -ENODEV;
     }
 
@@ -1994,7 +2004,6 @@ void nv_drm_register_drm_device(const struct NvKmsKapiGpuInfo *gpu_info)
 
     /* Load DRM device before registering it */
     if (nv_drm_dev_load(dev) != 0) {
-        NV_DRM_DEV_LOG_ERR(nv_dev, "Failed to load device");
         goto failed_drm_load;
     }