570.124.06

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.123.06.
+version 570.124.06.
 
 
 ## 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.123.06 driver release.  This can be achieved by installing
+570.124.06 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.123.06/README/kernel_open.html
+https://us.download.nvidia.com/XFree86/Linux-x86_64/570.124.06/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

@@ -86,7 +86,7 @@ EXTRA_CFLAGS += -I$(src)/common/inc
 EXTRA_CFLAGS += -I$(src)
 EXTRA_CFLAGS += -Wall $(DEFINES) $(INCLUDES) -Wno-cast-qual -Wno-format-extra-args
 EXTRA_CFLAGS += -D__KERNEL__ -DMODULE -DNVRM
-EXTRA_CFLAGS += -DNV_VERSION_STRING=\"570.123.06\"
+EXTRA_CFLAGS += -DNV_VERSION_STRING=\"570.124.06\"
 
 ifneq ($(SYSSRCHOST1X),)
  EXTRA_CFLAGS += -I$(SYSSRCHOST1X)

src/common/displayport/src/dp_connectorimpl.cpp

@@ -6067,6 +6067,7 @@ void ConnectorImpl::flushTimeslotsToHardware()
 
 void ConnectorImpl::beforeDeleteStream(GroupImpl * group, bool forFlushMode)
 {
+
     //
     // During flush entry, if the link is not trained, retrain
     // the link so that ACT can be ack'd by the sink.
@@ -6078,18 +6079,11 @@ void ConnectorImpl::beforeDeleteStream(GroupImpl * group, bool forFlushMode)
     // head is not actively driving pixels and this needs to be handled
     // differently .
     //
-    if (forFlushMode && linkUseMultistream())
+    if(forFlushMode && linkUseMultistream())
     {
         if(isLinkLost())
         {
-            if(!this->bDisable5019537Fix)
-            {
-                train(highestAssessedLC, false);
-            }
-            else
-            {
-                train(activeLinkConfig, false);
-            }
+            train(activeLinkConfig, false);
         }
     }
 
@@ -7313,11 +7307,8 @@ void ConnectorImpl::notifyShortPulse()
         {
             return;
         }
-
-        // Save the previous highest assessed LC
+        //save the previous highest assessed LC
         LinkConfiguration previousAssessedLC = highestAssessedLC;
-        // Save original active link configuration.
-        LinkConfiguration originalActiveLinkConfig = activeLinkConfig;
 
         if (main->isConnectorUSBTypeC() &&
             activeLinkConfig.bIs128b132bChannelCoding &&
@@ -7325,27 +7316,11 @@ void ConnectorImpl::notifyShortPulse()
         {
             if (activeLinkConfig.isValid() && enableFlush())
             {
-                if (!this->bDisable5019537Fix)
-                {
-                    train(originalActiveLinkConfig, true);
-                }
-                else
-                {
-                    train(activeLinkConfig, true);
-                }
+                train(activeLinkConfig, true);
                 disableFlush();
             }
-            
-            if (!this->bDisable5019537Fix)
-            {
-                main->invalidateLinkRatesInFallbackTable(originalActiveLinkConfig.peakRate);
-                hal->overrideCableIdCap(originalActiveLinkConfig.peakRate, false);
-            }
-            else
-            {
-                main->invalidateLinkRatesInFallbackTable(activeLinkConfig.peakRate);
-                hal->overrideCableIdCap(activeLinkConfig.peakRate, false);
-            }
+            main->invalidateLinkRatesInFallbackTable(activeLinkConfig.peakRate);
+            hal->overrideCableIdCap(activeLinkConfig.peakRate, false);
 
             highestAssessedLC = getMaxLinkConfig();
 
@@ -7359,16 +7334,8 @@ void ConnectorImpl::notifyShortPulse()
 
         if (activeLinkConfig.isValid() && enableFlush())
         {
-            bool bTrainSuccess = false;
-            if (!this->bDisable5019537Fix)
-            {
-                bTrainSuccess = train(originalActiveLinkConfig, false);
-            }
-            else
-            {
-                bTrainSuccess = train(activeLinkConfig, false);
-            }
-            if (!bTrainSuccess)
+            LinkConfiguration originalActiveLinkConfig = activeLinkConfig;
+            if (!train(activeLinkConfig, false))
             {
                 //
                 // If original link config could not be restored force

src/common/inc/nvBldVer.h

@@ -36,25 +36,25 @@
 // and then checked back in. You cannot make changes to these sections without
 // corresponding changes to the buildmeister script
 #ifndef NV_BUILD_BRANCH
-    #define NV_BUILD_BRANCH             VK571_25
+    #define NV_BUILD_BRANCH             r572_46
 #endif
 #ifndef NV_PUBLIC_BRANCH
-    #define NV_PUBLIC_BRANCH             VK571_25
+    #define NV_PUBLIC_BRANCH             r572_46
 #endif
 
 #if defined(NV_LINUX) || defined(NV_BSD) || defined(NV_SUNOS)
-#define NV_BUILD_BRANCH_VERSION         "rel/gpu_drv/r570/VK571_25-346"
-#define NV_BUILD_CHANGELIST_NUM         (35689316)
+#define NV_BUILD_BRANCH_VERSION         "rel/gpu_drv/r570/r572_46-344"
+#define NV_BUILD_CHANGELIST_NUM         (35599303)
 #define NV_BUILD_TYPE                   "Official"
-#define NV_BUILD_NAME                   "rel/gpu_drv/r570/VK571_25-346"
-#define NV_LAST_OFFICIAL_CHANGELIST_NUM (35689316)
+#define NV_BUILD_NAME                   "rel/gpu_drv/r570/r572_46-344"
+#define NV_LAST_OFFICIAL_CHANGELIST_NUM (35599303)
 
 #else     /* Windows builds */
-#define NV_BUILD_BRANCH_VERSION         "VK571_25-6"
-#define NV_BUILD_CHANGELIST_NUM         (35686891)
+#define NV_BUILD_BRANCH_VERSION         "r572_46-7"
+#define NV_BUILD_CHANGELIST_NUM         (35597621)
 #define NV_BUILD_TYPE                   "Official"
-#define NV_BUILD_NAME                   "572.82"
-#define NV_LAST_OFFICIAL_CHANGELIST_NUM (35686891)
+#define NV_BUILD_NAME                   "572.61"
+#define NV_LAST_OFFICIAL_CHANGELIST_NUM (35597621)
 #define NV_BUILD_BRANCH_BASE_VERSION    R570
 #endif
 // End buildmeister python edited section

src/common/inc/nvUnixVersion.h

@@ -4,7 +4,7 @@
 #if defined(NV_LINUX) || defined(NV_BSD) || defined(NV_SUNOS) || defined(NV_VMWARE) || defined(NV_QNX) || defined(NV_INTEGRITY) || \
     (defined(RMCFG_FEATURE_PLATFORM_GSP) && RMCFG_FEATURE_PLATFORM_GSP == 1)
 
-#define NV_VERSION_STRING               "570.123.06"
+#define NV_VERSION_STRING               "570.124.06"
 
 #else
 

version.mk

@@ -1,4 +1,4 @@
-NVIDIA_VERSION = 570.123.06
+NVIDIA_VERSION = 570.124.06
 
 # This file.
 VERSION_MK_FILE := $(lastword $(MAKEFILE_LIST))