mirror of
https://github.com/NVIDIA/open-gpu-kernel-modules.git
synced 2026-01-31 05:29:47 +00:00
535.288.01
This commit is contained in:
@@ -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 r539_56
|
||||
#define NV_BUILD_BRANCH r539_62
|
||||
#endif
|
||||
#ifndef NV_PUBLIC_BRANCH
|
||||
#define NV_PUBLIC_BRANCH r539_56
|
||||
#define NV_PUBLIC_BRANCH r539_62
|
||||
#endif
|
||||
|
||||
#if defined(NV_LINUX) || defined(NV_BSD) || defined(NV_SUNOS)
|
||||
#define NV_BUILD_BRANCH_VERSION "rel/gpu_drv/r535/r539_56-994"
|
||||
#define NV_BUILD_CHANGELIST_NUM (36497304)
|
||||
#define NV_BUILD_BRANCH_VERSION "rel/gpu_drv/r535/r539_62-1069"
|
||||
#define NV_BUILD_CHANGELIST_NUM (36903621)
|
||||
#define NV_BUILD_TYPE "Official"
|
||||
#define NV_BUILD_NAME "rel/gpu_drv/r535/r539_56-994"
|
||||
#define NV_LAST_OFFICIAL_CHANGELIST_NUM (36497304)
|
||||
#define NV_BUILD_NAME "rel/gpu_drv/r535/r539_62-1069"
|
||||
#define NV_LAST_OFFICIAL_CHANGELIST_NUM (36903621)
|
||||
|
||||
#else /* Windows builds */
|
||||
#define NV_BUILD_BRANCH_VERSION "r539_56-1"
|
||||
#define NV_BUILD_CHANGELIST_NUM (36476729)
|
||||
#define NV_BUILD_BRANCH_VERSION "r539_62-1"
|
||||
#define NV_BUILD_CHANGELIST_NUM (36902724)
|
||||
#define NV_BUILD_TYPE "Official"
|
||||
#define NV_BUILD_NAME "539.57"
|
||||
#define NV_LAST_OFFICIAL_CHANGELIST_NUM (36476729)
|
||||
#define NV_BUILD_NAME "539.63"
|
||||
#define NV_LAST_OFFICIAL_CHANGELIST_NUM (36902724)
|
||||
#define NV_BUILD_BRANCH_BASE_VERSION R535
|
||||
#endif
|
||||
// End buildmeister python edited section
|
||||
|
||||
@@ -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 "535.274.02"
|
||||
#define NV_VERSION_STRING "535.288.01"
|
||||
|
||||
#else
|
||||
|
||||
|
||||
@@ -1163,6 +1163,8 @@ gsyncReadUniversalFrameCount_P2060
|
||||
OBJTMR *pTmpTmr = NULL;
|
||||
OBJTMR *pTmr = GPU_GET_TIMER(pGpu);
|
||||
|
||||
NV_CHECK_OR_RETURN(LEVEL_INFO, gsyncIsFrameLocked_P2060(pThis), NV_ERR_INVALID_STATE);
|
||||
|
||||
if (!(pThis->FrameCountData.iface == NV_P2060_MAX_IFACES_PER_GSYNC))
|
||||
{
|
||||
//
|
||||
@@ -1207,7 +1209,8 @@ gsyncReadUniversalFrameCount_P2060
|
||||
// P2060 refreshrate is in 0.00001 Hz, so divide by 10000 to get Hz.
|
||||
// divide 1000000 by refreshRate to get the frame time in us.
|
||||
//
|
||||
pThis->FrameCountData.frameTime = 1000000 / (pThis->RefreshRate/10000); //in us
|
||||
NV_CHECK_OR_RETURN(LEVEL_INFO, pThis->RefreshRate >= 10, NV_ERR_INVALID_STATE);
|
||||
pThis->FrameCountData.frameTime = 1000*1000*1000 / (pThis->RefreshRate/10); //in us
|
||||
|
||||
//
|
||||
// Enable FrameCountTimerService to verify FrameCountData.initialDifference.
|
||||
|
||||
@@ -358,6 +358,7 @@ kgraphicsStateLoad_IMPL
|
||||
NvU32 flags
|
||||
)
|
||||
{
|
||||
|
||||
if (pGpu->fecsCtxswLogConsumerCount > 0)
|
||||
{
|
||||
fecsBufferMap(pGpu, pKernelGraphics);
|
||||
|
||||
@@ -382,9 +382,9 @@ NvU32 vgpuDevReadReg032(
|
||||
OBJSYS *pSys = SYS_GET_INSTANCE();
|
||||
OBJHYPERVISOR *pHypervisor = SYS_GET_HYPERVISOR(pSys);
|
||||
|
||||
if(!pGpu ||
|
||||
!pHypervisor || !pHypervisor->bDetected || !pHypervisor->bIsHVMGuest ||
|
||||
!GPU_GET_KERNEL_BIF(pGpu))
|
||||
|
||||
if (!pGpu || !GPU_GET_KERNEL_BIF(pGpu) ||
|
||||
(!IS_VIRTUAL(pGpu) && !(pHypervisor && pHypervisor->bDetected && pHypervisor->bIsHVMGuest)))
|
||||
{
|
||||
*vgpuHandled = NV_FALSE;
|
||||
return 0;
|
||||
|
||||
Reference in New Issue
Block a user