NVIDIA/open-gpu-kernel-modules
1
0
Fork 0
mirror of https://github.com/NVIDIA/open-gpu-kernel-modules.git synced 2026-01-31 13:39:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

570.123.06

Browse Source
This commit is contained in:
russellcnv
2025-03-14 14:23:17 -07:00
parent 5a7bfda3b8
commit 5e6ad2b575
6 changed files with 56 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/common/displayport/src/dp_connectorimpl.cpp
View File

@@ -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

16
src/common/inc/nvBldVer.h
View File

@@ -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

2
src/common/inc/nvUnixVersion.h
View File

@@ -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