555.58.02

(cherry picked from commit 1795a8bb20)
This commit is contained in:
Bernhard Stoeckner
2024-07-01 14:52:22 +02:00
committed by Gaurav Juvekar
parent 171c735e57
commit 5fdf5032fb
8 changed files with 33 additions and 20 deletions

View File

@@ -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 r555_00
#define NV_BUILD_BRANCH r556_09
#endif
#ifndef NV_PUBLIC_BRANCH
#define NV_PUBLIC_BRANCH r555_00
#define NV_PUBLIC_BRANCH r556_09
#endif
#if defined(NV_LINUX) || defined(NV_BSD) || defined(NV_SUNOS)
#define NV_BUILD_BRANCH_VERSION "rel/gpu_drv/r555/r555_00-164"
#define NV_BUILD_CHANGELIST_NUM (34441657)
#define NV_BUILD_BRANCH_VERSION "rel/gpu_drv/r555/r556_09-165"
#define NV_BUILD_CHANGELIST_NUM (34455816)
#define NV_BUILD_TYPE "Official"
#define NV_BUILD_NAME "rel/gpu_drv/r555/r555_00-164"
#define NV_LAST_OFFICIAL_CHANGELIST_NUM (34441657)
#define NV_BUILD_NAME "rel/gpu_drv/r555/r556_09-165"
#define NV_LAST_OFFICIAL_CHANGELIST_NUM (34455816)
#else /* Windows builds */
#define NV_BUILD_BRANCH_VERSION "r555_00-166"
#define NV_BUILD_CHANGELIST_NUM (34441657)
#define NV_BUILD_BRANCH_VERSION "r556_09-1"
#define NV_BUILD_CHANGELIST_NUM (34444748)
#define NV_BUILD_TYPE "Official"
#define NV_BUILD_NAME "556.09"
#define NV_LAST_OFFICIAL_CHANGELIST_NUM (34441657)
#define NV_BUILD_NAME "556.10"
#define NV_LAST_OFFICIAL_CHANGELIST_NUM (34444748)
#define NV_BUILD_BRANCH_BASE_VERSION R555
#endif
// End buildmeister python edited section

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 "555.58"
#define NV_VERSION_STRING "555.58.02"
#else

View File

@@ -216,6 +216,9 @@ typedef struct NV0073_CTRL_SYSTEM_GET_SCANLINE_PARAMS {
* This parameter specifies the head for which the vblank counter
* should be retrieved. This value must be between zero and the
* maximum number of heads supported by the subdevice.
* lowLatencyHint
* RM maintains several different vblank counts. When this parameter is
* NV_TRUE, the command may return the low latency count.
* verticalBlankCounter
* This parameter returns the vblank counter value for the specified
* head. If the display mode is not valid or vblank not active then
@@ -230,9 +233,10 @@ typedef struct NV0073_CTRL_SYSTEM_GET_SCANLINE_PARAMS {
#define NV0073_CTRL_SYSTEM_GET_VBLANK_COUNTER_PARAMS_MESSAGE_ID (0x05U)
typedef struct NV0073_CTRL_SYSTEM_GET_VBLANK_COUNTER_PARAMS {
NvU32 subDeviceInstance;
NvU32 head;
NvU32 verticalBlankCounter;
NvU32 subDeviceInstance;
NvU32 head;
NvBool lowLatencyHint;
NvU32 verticalBlankCounter;
} NV0073_CTRL_SYSTEM_GET_VBLANK_COUNTER_PARAMS;
/*

View File

@@ -329,7 +329,14 @@ dispcmnCtrlCmdSystemGetVblankCounter_IMPL
if (IS_GSP_CLIENT(pGpu))
{
pVBCounterParams->verticalBlankCounter = pKernelDisplay->pSharedData->kHeadVblankCount[pKernelHead->PublicId];
if (pVBCounterParams->lowLatencyHint)
{
pVBCounterParams->verticalBlankCounter = kheadGetVblankLowLatencyCounter_HAL(pKernelHead);
}
else
{
pVBCounterParams->verticalBlankCounter = pKernelDisplay->pSharedData->kHeadVblankCount[pKernelHead->PublicId];
}
}
else
{