mirror of
https://github.com/NVIDIA/open-gpu-kernel-modules.git
synced 2026-01-30 21:19:49 +00:00
535.86.05
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 r536_08
|
||||
#define NV_BUILD_BRANCH r536_62
|
||||
#endif
|
||||
#ifndef NV_PUBLIC_BRANCH
|
||||
#define NV_PUBLIC_BRANCH r536_08
|
||||
#define NV_PUBLIC_BRANCH r536_62
|
||||
#endif
|
||||
|
||||
#if defined(NV_LINUX) || defined(NV_BSD) || defined(NV_SUNOS)
|
||||
#define NV_BUILD_BRANCH_VERSION "rel/gpu_drv/r535/r536_08-145"
|
||||
#define NV_BUILD_CHANGELIST_NUM (32940552)
|
||||
#define NV_BUILD_BRANCH_VERSION "rel/gpu_drv/r535/r536_62-214"
|
||||
#define NV_BUILD_CHANGELIST_NUM (33069717)
|
||||
#define NV_BUILD_TYPE "Official"
|
||||
#define NV_BUILD_NAME "rel/gpu_drv/r535/r536_08-145"
|
||||
#define NV_LAST_OFFICIAL_CHANGELIST_NUM (32940552)
|
||||
#define NV_BUILD_NAME "rel/gpu_drv/r535/r536_62-214"
|
||||
#define NV_LAST_OFFICIAL_CHANGELIST_NUM (33069717)
|
||||
|
||||
#else /* Windows builds */
|
||||
#define NV_BUILD_BRANCH_VERSION "r536_08-4"
|
||||
#define NV_BUILD_CHANGELIST_NUM (32940552)
|
||||
#define NV_BUILD_BRANCH_VERSION "r536_62-3"
|
||||
#define NV_BUILD_CHANGELIST_NUM (33061144)
|
||||
#define NV_BUILD_TYPE "Official"
|
||||
#define NV_BUILD_NAME "536.19"
|
||||
#define NV_LAST_OFFICIAL_CHANGELIST_NUM (32940552)
|
||||
#define NV_BUILD_NAME "536.67"
|
||||
#define NV_LAST_OFFICIAL_CHANGELIST_NUM (33061144)
|
||||
#define NV_BUILD_BRANCH_BASE_VERSION R535
|
||||
#endif
|
||||
// End buildmeister python edited section
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* SPDX-FileCopyrightText: Copyright (c) 2009 - 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
|
||||
* SPDX-FileCopyrightText: Copyright (c) 2009 - 2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
|
||||
* SPDX-License-Identifier: MIT
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
@@ -443,6 +443,7 @@ static const PNPVendorId PNPVendorIds[] =
|
||||
{ "SAN", _VENDOR_NAME_ENTRY("Sanyo Electric Co.,Ltd.") },
|
||||
{ "SCC", _VENDOR_NAME_ENTRY("SORD") },
|
||||
{ "SCD", _VENDOR_NAME_ENTRY("Sanyo") },
|
||||
{ "SDC", _VENDOR_NAME_ENTRY("Samsung Display Corp.") },
|
||||
{ "SDI", _VENDOR_NAME_ENTRY("Samtron/Sigma Designs") },
|
||||
{ "SDT", _VENDOR_NAME_ENTRY("Siemens AG") },
|
||||
{ "SEA", _VENDOR_NAME_ENTRY("Segate") },
|
||||
|
||||
@@ -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.54.03"
|
||||
#define NV_VERSION_STRING "535.86.05"
|
||||
|
||||
#else
|
||||
|
||||
|
||||
@@ -112,23 +112,12 @@ struct _NVLOG_BUFFER
|
||||
#endif // NVOS_IS_UNIX
|
||||
|
||||
|
||||
//
|
||||
// Due to this file's peculiar location, NvPort may or may not be includable
|
||||
// This hack will go away when NvLog is moved into common/shared
|
||||
//
|
||||
#if NVOS_IS_MACINTOSH
|
||||
|
||||
#if !PORT_IS_KERNEL_BUILD
|
||||
typedef struct PORT_SPINLOCK PORT_SPINLOCK;
|
||||
typedef struct PORT_MUTEX PORT_MUTEX;
|
||||
#else
|
||||
#include "nvport/nvport.h"
|
||||
#endif
|
||||
typedef struct PORT_RWLOCK PORT_RWLOCK;
|
||||
|
||||
#elif !defined(PORT_IS_KERNEL_BUILD)
|
||||
typedef struct PORT_SPINLOCK PORT_SPINLOCK;
|
||||
typedef struct PORT_MUTEX PORT_MUTEX;
|
||||
#else
|
||||
#if PORT_IS_KERNEL_BUILD
|
||||
#include "nvport/nvport.h"
|
||||
#endif
|
||||
|
||||
@@ -149,6 +138,8 @@ typedef struct _NVLOG_LOGGER
|
||||
PORT_SPINLOCK* mainLock;
|
||||
/** Lock for creating/deleting pBuffers and accessing them from RmCtrls */
|
||||
PORT_MUTEX* buffersLock;
|
||||
/** Lock for registering/deregistering flush callbacks */
|
||||
PORT_RWLOCK *flushCbsLock;
|
||||
} NVLOG_LOGGER;
|
||||
extern NVLOG_LOGGER NvLogLogger;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user