570.181

Author: mmaneetsingh

README.md

@@ -1,7 +1,7 @@
 # NVIDIA Linux Open GPU Kernel Module Source
 
 This is the source release of the NVIDIA Linux open GPU kernel modules,
-version 570.172.08.
+version 570.181.
 
 
 ## How to Build
@@ -17,7 +17,7 @@ as root:
 
 Note that the kernel modules built here must be used with GSP
 firmware and user-space NVIDIA GPU driver components from a corresponding
-570.172.08 driver release.  This can be achieved by installing
+570.181 driver release.  This can be achieved by installing
 the NVIDIA GPU driver from the .run file using the `--no-kernel-modules`
 option.  E.g.,
 
@@ -185,7 +185,7 @@ table below).
 For details on feature support and limitations, see the NVIDIA GPU driver
 end user README here:
 
-https://us.download.nvidia.com/XFree86/Linux-x86_64/570.172.08/README/kernel_open.html
+https://us.download.nvidia.com/XFree86/Linux-x86_64/570.181/README/kernel_open.html
 
 For vGPU support, please refer to the README.vgpu packaged in the vGPU Host
 Package for more details.

kernel-open/Kbuild

@@ -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=\"570.172.08\"
+ccflags-y += -DNV_VERSION_STRING=\"570.181\"
 
 ifneq ($(SYSSRCHOST1X),)
  ccflags-y += -I$(SYSSRCHOST1X)

kernel-open/header-presence-tests.mk

@@ -36,6 +36,7 @@ NV_HEADER_PRESENCE_TESTS = \
   generated/autoconf.h \
   generated/compile.h \
   generated/utsrelease.h \
+  linux/pfn_t.h \
   linux/aperture.h \
   linux/dma-direct.h \
   linux/efi.h \

kernel-open/nvidia-drm/nvidia-drm-gem-user-memory.c

@@ -157,7 +157,13 @@ static vm_fault_t __nv_drm_gem_user_memory_handle_vma_fault(
 #if !defined(NV_LINUX)
     return vmf_insert_pfn(vma, address, pfn);
 #elif defined(NV_VMF_INSERT_MIXED_PRESENT)
+
+#if defined(NV_LINUX_PFN_T_H_PRESENT)
     return vmf_insert_mixed(vma, address, pfn_to_pfn_t(pfn));
+#else
+    return vmf_insert_mixed(vma, address, pfn);
+#endif
+
 #else
     return __nv_vm_insert_mixed_helper(vma, address, pfn);
 #endif

kernel-open/nvidia/nv.c

@@ -1417,50 +1417,35 @@ static int nv_start_device(nv_state_t *nv, nvidia_stack_t *sp)
     {
         rc = os_alloc_mutex(&nvl->isr_bh_unlocked_mutex);
         if (rc != 0)
-            goto failed;
+            goto failed_release_irq;
         nv_kthread_q_item_init(&nvl->bottom_half_q_item, nvidia_isr_bh_unlocked, (void *)nv);
         rc = nv_kthread_q_init(&nvl->bottom_half_q, nv_device_name);
         if (rc != 0)
-            goto failed;
+            goto failed_release_irq;
         kthread_init = NV_TRUE;
 
         rc = nv_kthread_q_init(&nvl->queue.nvk, "nv_queue");
         if (rc)
-            goto failed;
+            goto failed_release_irq;
         nv->queue = &nvl->queue;
 
         if (nv_platform_use_auto_online(nvl))
         {
             rc = nv_kthread_q_init(&nvl->remove_numa_memory_q,
                                    "nv_remove_numa_memory");
             if (rc)
-                goto failed;
+                goto failed_release_irq;
             remove_numa_memory_kthread_init = NV_TRUE;
         }
     }
 
     if (!rm_init_adapter(sp, nv))
     {
-        if (!(nv->flags & NV_FLAG_USES_MSIX) &&
-            !(nv->flags & NV_FLAG_SOC_DISPLAY) &&
-            !(nv->flags & NV_FLAG_SOC_IGPU))
-        {
-            free_irq(nv->interrupt_line, (void *) nvl);
-        }
-        else if (nv->flags & NV_FLAG_SOC_DISPLAY)
-        {
-        }
-#if defined(NV_LINUX_PCIE_MSI_SUPPORTED)
-        else
-        {
-            nv_free_msix_irq(nvl);
-        }
-#endif
         NV_DEV_PRINTF(NV_DBG_ERRORS, nv,
                       "rm_init_adapter failed, device minor number %d\n",
                       nvl->minor_num);
         rc = -EIO;
-        goto failed;
+        goto failed_release_irq;
     }
 
     {
@@ -1494,6 +1479,26 @@ static int nv_start_device(nv_state_t *nv, nvidia_stack_t *sp)
 
     return 0;
 
+failed_release_irq:
+    if (!(nv->flags & NV_FLAG_PERSISTENT_SW_STATE))
+    {
+        if (!(nv->flags & NV_FLAG_USES_MSIX) &&
+            !(nv->flags & NV_FLAG_SOC_DISPLAY) &&
+            !(nv->flags & NV_FLAG_SOC_IGPU))
+        {
+            free_irq(nv->interrupt_line, (void *) nvl);
+        }
+        else if (nv->flags & NV_FLAG_SOC_DISPLAY)
+        {
+        }
+#if defined(NV_LINUX_PCIE_MSI_SUPPORTED)
+        else
+        {
+            nv_free_msix_irq(nvl);
+        }
+#endif
+    }
+
 failed:
 #if defined(NV_LINUX_PCIE_MSI_SUPPORTED)
     if (nv->flags & NV_FLAG_USES_MSI)
@@ -2417,6 +2422,7 @@ nvidia_ioctl(
     if (arg_cmd == NV_ESC_WAIT_OPEN_COMPLETE)
     {
         nv_ioctl_wait_open_complete_t *params = arg_copy;
+
         params->rc = nvlfp->open_rc;
         params->adapterStatus = nvlfp->adapter_status;
         goto done_early;

src/common/displayport/inc/dp_connectorimpl.h

@@ -388,6 +388,9 @@ namespace DisplayPort
         NvU64       allocatedDpTunnelBwShadow;
         bool        bForceDisableTunnelBwAllocation;
 
+        // Use regkey DP_DSC_DEVID_WAR to toggle this flag.
+        bool        bEnableDevId;
+
         Group *perHeadAttachedGroup[NV_MAX_HEADS];
         NvU32 inTransitionHeadMask;
 

src/common/displayport/inc/dp_regkeydatabase.h

@@ -99,6 +99,9 @@
 #define NV_DP_REGKEY_DISABLE_FIX_FOR_5019537                      "DP_DISABLE_5019537_FIX"
 #define NV_DP_REGKEY_ENABLE_FIX_FOR_5147205                       "DP_ENABLE_5147205_FIX"
 
+// This regkey forces devID to be exposed to vendors via DPCD 0x309 for DSC-enabled SKUs.
+#define NV_DP_REGKEY_EXPOSE_DSC_DEVID_WAR                         "DP_DSC_DEVID_WAR"
+
 // Bug 5088957 : Force head shutdown in DpLib
 #define NV_DP_REGKEY_FORCE_HEAD_SHUTDOWN                          "DP_WAR_5088957"
 
@@ -150,6 +153,7 @@ struct DP_REGKEY_DATABASE
     bool  bForceHeadShutdown;
     bool  bEnableLowerBppCheckForDsc;
     bool  bSkipSettingLinkStateDuringUnplug;
+    bool  bEnableDevId;
 };
 
 extern struct DP_REGKEY_DATABASE dpRegkeyDatabase;

src/common/displayport/src/dp_connectorimpl.cpp

@@ -51,6 +51,17 @@
 #include "ctrl/ctrl0073/ctrl0073dp.h"
 #include "dp_tracing.h"
 
+/*
+ * This is needed by Synaptics to disable DisplayExpand feature 
+ * in some of their docking station based on if GPU supports DSC. 
+ * Feature is not needed if DSC is supported.
+ * Customers reported problems with the feature enabled on GB20x devices
+ * and requested GPU DSC detection to disable DisplayExpand feature.
+ * DSC is supported in Turing and later SKUs hence
+ * exposing Turing DevId to customers to address their requirement. 
+ */
+#define TURING_DEV_ID  0x1E
+
 using namespace DisplayPort;
 
 ConnectorImpl::ConnectorImpl(MainLink * main, AuxBus * auxBus, Timer * timer, Connector::EventSink * sink)
@@ -187,6 +198,7 @@ void ConnectorImpl::applyRegkeyOverrides(const DP_REGKEY_DATABASE& dpRegkeyDatab
     this->bForceHeadShutdownFromRegkey      = dpRegkeyDatabase.bForceHeadShutdown;
     this->bEnableLowerBppCheckForDsc        = dpRegkeyDatabase.bEnableLowerBppCheckForDsc;
     this->bSkipSettingLinkStateDuringUnplug = dpRegkeyDatabase.bSkipSettingLinkStateDuringUnplug;
+    this->bEnableDevId                      = dpRegkeyDatabase.bEnableDevId;
 }
 
 void ConnectorImpl::setPolicyModesetOrderMitigation(bool enabled)
@@ -3894,14 +3906,20 @@ bool ConnectorImpl::getIgnoreSourceOuiHandshake()
 bool ConnectorImpl::performIeeeOuiHandshake()
 {
     const char *ieeeOuiDevId = "NVIDIA";
+    NvU8        chipRevision = 0x0;
+    bool        bGpuDscSupported = NV_FALSE;
+
+    main->getDscCaps(&bGpuDscSupported);
+    if ((this->bEnableDevId) && (bGpuDscSupported))
+    {
+        chipRevision = TURING_DEV_ID;
+    }
 
     if (!hal->getOuiSupported() || getIgnoreSourceOuiHandshake())
         return false;
 
-    if (hal->setOuiSource(DPCD_OUI_NVIDIA, ieeeOuiDevId, 6 /* string length of ieeeOuiDevId */, 0) == AuxRetry::ack)
+    if (hal->setOuiSource(DPCD_OUI_NVIDIA, ieeeOuiDevId, 6 /* string length of ieeeOuiDevId */, chipRevision) == AuxRetry::ack)
     {
-        NvU8 chipRevision = 0;
-
         // parse client OUI.
         if (hal->getOuiSink(ouiId, &modelName[0], sizeof(modelName), chipRevision))
         {

src/common/displayport/src/dp_evoadapter.cpp

@@ -107,7 +107,8 @@ const struct
     {NV_DP_REGKEY_ENABLE_FIX_FOR_5147205,                &dpRegkeyDatabase.bEnable5147205Fix,                 DP_REG_VAL_BOOL},
     {NV_DP_REGKEY_FORCE_HEAD_SHUTDOWN,                   &dpRegkeyDatabase.bForceHeadShutdown,                DP_REG_VAL_BOOL},
     {NV_DP_REGKEY_ENABLE_LOWER_BPP_CHECK_FOR_DSC,        &dpRegkeyDatabase.bEnableLowerBppCheckForDsc,        DP_REG_VAL_BOOL},
-    {NV_DP_REGKEY_SKIP_SETTING_LINK_STATE_DURING_UNPLUG, &dpRegkeyDatabase.bSkipSettingLinkStateDuringUnplug, DP_REG_VAL_BOOL}
+    {NV_DP_REGKEY_SKIP_SETTING_LINK_STATE_DURING_UNPLUG, &dpRegkeyDatabase.bSkipSettingLinkStateDuringUnplug, DP_REG_VAL_BOOL},
+    {NV_DP_REGKEY_EXPOSE_DSC_DEVID_WAR,                  &dpRegkeyDatabase.bEnableDevId,                      DP_REG_VAL_BOOL}
 };
 
 EvoMainLink::EvoMainLink(EvoInterface * provider, Timer * timer) :

src/common/displayport/src/dp_wardatabase.cpp

@@ -117,9 +117,9 @@ void ConnectorImpl2x::applyOuiWARs()
                 (modelName[1] == 'C') &&
                 (modelName[2] == '2') &&
                 (modelName[3] == '9') &&
-                (modelName[4] == '0') &&
-                (modelName[5] == 0x04U))
+                (modelName[4] == '0'))
             {
+                bForceHeadShutdownPerMonitor = true;
                 bApplyStuffDummySymbolsWAR = true;
                 bStuffDummySymbolsFor128b132b = false;
                 bStuffDummySymbolsFor8b10b = true;