diff --git a/README.md b/README.md index 6e26b6027..4c5bd528d 100644 --- a/README.md +++ b/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.01. +version 570.123.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.01 driver release. This can be achieved by installing +570.123.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.01/README/kernel_open.html +https://us.download.nvidia.com/XFree86/Linux-x86_64/570.123.06/README/kernel_open.html For vGPU support, please refer to the README.vgpu packaged in the vGPU Host Package for more details. diff --git a/kernel-open/Kbuild b/kernel-open/Kbuild index e601bb6ec..add98a079 100644 --- a/kernel-open/Kbuild +++ b/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.01\" +EXTRA_CFLAGS += -DNV_VERSION_STRING=\"570.123.06\" ifneq ($(SYSSRCHOST1X),) EXTRA_CFLAGS += -I$(SYSSRCHOST1X) diff --git a/src/common/displayport/src/dp_connectorimpl.cpp b/src/common/displayport/src/dp_connectorimpl.cpp index b89c4cc09..6e8e75200 100644 --- a/src/common/displayport/src/dp_connectorimpl.cpp +++ b/src/common/displayport/src/dp_connectorimpl.cpp @@ -6067,7 +6067,6 @@ 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. @@ -6079,11 +6078,18 @@ 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()) { - train(activeLinkConfig, false); + if(!this->bDisable5019537Fix) + { + train(highestAssessedLC, false); + } + else + { + train(activeLinkConfig, false); + } } } @@ -7307,8 +7313,11 @@ 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 && @@ -7316,11 +7325,27 @@ void ConnectorImpl::notifyShortPulse() { if (activeLinkConfig.isValid() && enableFlush()) { - train(activeLinkConfig, true); + if (!this->bDisable5019537Fix) + { + train(originalActiveLinkConfig, true); + } + else + { + train(activeLinkConfig, true); + } disableFlush(); } - main->invalidateLinkRatesInFallbackTable(activeLinkConfig.peakRate); - hal->overrideCableIdCap(activeLinkConfig.peakRate, false); + + if (!this->bDisable5019537Fix) + { + main->invalidateLinkRatesInFallbackTable(originalActiveLinkConfig.peakRate); + hal->overrideCableIdCap(originalActiveLinkConfig.peakRate, false); + } + else + { + main->invalidateLinkRatesInFallbackTable(activeLinkConfig.peakRate); + hal->overrideCableIdCap(activeLinkConfig.peakRate, false); + } highestAssessedLC = getMaxLinkConfig(); @@ -7334,8 +7359,16 @@ void ConnectorImpl::notifyShortPulse() if (activeLinkConfig.isValid() && enableFlush()) { - LinkConfiguration originalActiveLinkConfig = activeLinkConfig; - if (!train(activeLinkConfig, false)) + bool bTrainSuccess = false; + if (!this->bDisable5019537Fix) + { + bTrainSuccess = train(originalActiveLinkConfig, false); + } + else + { + bTrainSuccess = train(activeLinkConfig, false); + } + if (!bTrainSuccess) { // // If original link config could not be restored force diff --git a/src/common/inc/nvBldVer.h b/src/common/inc/nvBldVer.h index 0e8cbb744..598136739 100644 --- a/src/common/inc/nvBldVer.h +++ b/src/common/inc/nvBldVer.h @@ -43,18 +43,18 @@ #endif #if defined(NV_LINUX) || defined(NV_BSD) || defined(NV_SUNOS) -#define NV_BUILD_BRANCH_VERSION "rel/gpu_drv/r570/VK571_25-341" -#define NV_BUILD_CHANGELIST_NUM (35614309) +#define NV_BUILD_BRANCH_VERSION "rel/gpu_drv/r570/VK571_25-346" +#define NV_BUILD_CHANGELIST_NUM (35689316) #define NV_BUILD_TYPE "Official" -#define NV_BUILD_NAME "rel/gpu_drv/r570/VK571_25-341" -#define NV_LAST_OFFICIAL_CHANGELIST_NUM (35614309) +#define NV_BUILD_NAME "rel/gpu_drv/r570/VK571_25-346" +#define NV_LAST_OFFICIAL_CHANGELIST_NUM (35689316) #else /* Windows builds */ -#define NV_BUILD_BRANCH_VERSION "VK571_25-3" -#define NV_BUILD_CHANGELIST_NUM (35614309) +#define NV_BUILD_BRANCH_VERSION "VK571_25-6" +#define NV_BUILD_CHANGELIST_NUM (35686891) #define NV_BUILD_TYPE "Official" -#define NV_BUILD_NAME "572.63" -#define NV_LAST_OFFICIAL_CHANGELIST_NUM (35614309) +#define NV_BUILD_NAME "572.82" +#define NV_LAST_OFFICIAL_CHANGELIST_NUM (35686891) #define NV_BUILD_BRANCH_BASE_VERSION R570 #endif // End buildmeister python edited section diff --git a/src/common/inc/nvUnixVersion.h b/src/common/inc/nvUnixVersion.h index 6aa0c325f..be0c92c41 100644 --- a/src/common/inc/nvUnixVersion.h +++ b/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.01" +#define NV_VERSION_STRING "570.123.06" #else diff --git a/version.mk b/version.mk index 863f135ef..41a3ccf75 100644 --- a/version.mk +++ b/version.mk @@ -1,4 +1,4 @@ -NVIDIA_VERSION = 570.123.01 +NVIDIA_VERSION = 570.123.06 # This file. VERSION_MK_FILE := $(lastword $(MAKEFILE_LIST))