545.29.06

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Release 545 Entries
 
+### [545.29.06] 2023-11-22
+
+#### Fixed
+
+- The brightness control of NVIDIA seems to be broken, [#573](https://github.com/NVIDIA/open-gpu-kernel-modules/issues/573)
+
 ### [545.29.02] 2023-10-31
 
 ### [545.23.06] 2023-10-17
@@ -16,6 +22,8 @@
 
 ## Release 535 Entries
 
+### [535.129.03] 2023-10-31
+
 ### [535.113.01] 2023-09-21
 
 #### Fixed
@@ -64,10 +72,14 @@
 
 ## Release 525 Entries
 
+### [525.147.05] 2023-10-31
+
 #### Fixed
 
 - Fix nvidia_p2p_get_pages(): Fix double-free in register-callback error path, [#557](https://github.com/NVIDIA/open-gpu-kernel-modules/pull/557) by @BrendanCunningham
 
+### [525.125.06] 2023-06-26
+
 ### [525.116.04] 2023-05-09
 
 ### [525.116.03] 2023-04-25

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 545.29.02.
+version 545.29.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
-545.29.02 driver release.  This can be achieved by installing
+545.29.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.,
 
@@ -188,7 +188,7 @@ encountered specific to them.
 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/545.29.02/README/kernel_open.html
+https://us.download.nvidia.com/XFree86/Linux-x86_64/545.29.06/README/kernel_open.html
 
 In the below table, if three IDs are listed, the first is the PCI Device 
 ID, the second is the PCI Subsystem Vendor ID, and the third is the PCI
@@ -750,8 +750,8 @@ Subsystem Device ID.
 | NVIDIA H100 PCIe                                | 2331 10DE 1626 |
 | NVIDIA H100                                     | 2339 10DE 17FC |
 | NVIDIA H800 NVL                                 | 233A 10DE 183A |
-| GH200 120GB                                     | 2342 10DE 16EB |
-| GH200 480GB                                     | 2342 10DE 1809 |
+| NVIDIA GH200 120GB                              | 2342 10DE 16EB |
+| NVIDIA GH200 480GB                              | 2342 10DE 1809 |
 | NVIDIA GeForce RTX 3060 Ti                      | 2414           |
 | NVIDIA GeForce RTX 3080 Ti Laptop GPU           | 2420           |
 | NVIDIA RTX A5500 Laptop GPU                     | 2438           |

kernel-open/Kbuild

@@ -72,7 +72,7 @@ EXTRA_CFLAGS += -I$(src)/common/inc
 EXTRA_CFLAGS += -I$(src)
 EXTRA_CFLAGS += -Wall $(DEFINES) $(INCLUDES) -Wno-cast-qual -Wno-error -Wno-format-extra-args
 EXTRA_CFLAGS += -D__KERNEL__ -DMODULE -DNVRM
-EXTRA_CFLAGS += -DNV_VERSION_STRING=\"545.29.02\"
+EXTRA_CFLAGS += -DNV_VERSION_STRING=\"545.29.06\"
 
 ifneq ($(SYSSRCHOST1X),)
  EXTRA_CFLAGS += -I$(SYSSRCHOST1X)

kernel-open/nvidia-modeset/nvidia-modeset-linux.c

@@ -218,9 +218,23 @@ static inline int nvkms_read_trylock_pm_lock(void)
 
 static inline void nvkms_read_lock_pm_lock(void)
 {
-    while (!down_read_trylock(&nvkms_pm_lock)) {
-        try_to_freeze();
-        cond_resched();
+    if ((current->flags & PF_NOFREEZE)) {
+        /*
+         * Non-freezable tasks (i.e. kthreads in this case) don't have to worry
+         * about being frozen during system suspend, but do need to block so
+         * that the CPU can go idle during s2idle. Do a normal uninterruptible
+         * blocking wait for the PM lock.
+         */
+        down_read(&nvkms_pm_lock);
+    } else {
+        /*
+         * For freezable tasks, make sure we give the kernel an opportunity to
+         * freeze if taking the PM lock fails.
+         */
+        while (!down_read_trylock(&nvkms_pm_lock)) {
+            try_to_freeze();
+            cond_resched();
+        }
     }
 }
 

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/r545/r545_96-120"
-#define NV_BUILD_CHANGELIST_NUM         (33457372)
+#define NV_BUILD_BRANCH_VERSION         "rel/gpu_drv/r545/r545_96-124"
+#define NV_BUILD_CHANGELIST_NUM         (33538619)
 #define NV_BUILD_TYPE                   "Official"
-#define NV_BUILD_NAME                   "rel/gpu_drv/r545/r545_96-120"
-#define NV_LAST_OFFICIAL_CHANGELIST_NUM (33457372)
+#define NV_BUILD_NAME                   "rel/gpu_drv/r545/r545_96-124"
+#define NV_LAST_OFFICIAL_CHANGELIST_NUM (33538619)
 
 #else     /* Windows builds */
-#define NV_BUILD_BRANCH_VERSION         "r545_96-2"
-#define NV_BUILD_CHANGELIST_NUM         (33457372)
+#define NV_BUILD_BRANCH_VERSION         "r545_96-8"
+#define NV_BUILD_CHANGELIST_NUM         (33517029)
 #define NV_BUILD_TYPE                   "Official"
-#define NV_BUILD_NAME                   "546.01"
-#define NV_LAST_OFFICIAL_CHANGELIST_NUM (33457372)
+#define NV_BUILD_NAME                   "546.17"
+#define NV_LAST_OFFICIAL_CHANGELIST_NUM (33517029)
 #define NV_BUILD_BRANCH_BASE_VERSION    R545
 #endif
 // End buildmeister python edited section

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               "545.29.02"
+#define NV_VERSION_STRING               "545.29.06"
 
 #else
 

src/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080internal.h

@@ -403,6 +403,45 @@ typedef struct NV2080_CTRL_KGR_GET_CTX_BUFFER_PTES_PARAMS {
     NvBool   bNoMorePages;
 } NV2080_CTRL_KGR_GET_CTX_BUFFER_PTES_PARAMS;
 
+/*!
+ * NV2080_CTRL_INTERNAL_MEMDESC_INFO
+ *
+ * A generic container structure representing a memory region to be used as a
+ * component of other control call parameters.
+ *
+ */
+typedef struct NV2080_CTRL_INTERNAL_MEMDESC_INFO {
+    NV_DECLARE_ALIGNED(NvU64 base, 8);
+    NV_DECLARE_ALIGNED(NvU64 size, 8);
+    NV_DECLARE_ALIGNED(NvU64 alignment, 8);
+    NvU32 addressSpace;
+    NvU32 cpuCacheAttrib;
+} NV2080_CTRL_INTERNAL_MEMDESC_INFO;
+
+/*
+ * NV2080_CTRL_CMD_INTERNAL_FLCN_SET_VIDEO_EVENT_BUFFER_MEMORY
+ *
+ * Set memory for use by the video event buffer
+ *
+ * memDescInfo
+ *  Information to set up memory descriptor on GSP
+ *
+ * engDesc
+ *  Video engdesc to find correct engine
+ *
+ * bEngineFound
+ *  Bool for whether or not the engine is actually assigned to a video object
+ */
+#define NV2080_CTRL_CMD_INTERNAL_FLCN_SET_VIDEO_EVENT_BUFFER_MEMORY (0x20800a29) /* finn: Evaluated from "(FINN_NV20_SUBDEVICE_0_INTERNAL_INTERFACE_ID << 8) | NV2080_CTRL_INTERNAL_FLCN_SET_VIDEO_EVENT_BUFFER_MEMORY_PARAMS_MESSAGE_ID" */
+
+#define NV2080_CTRL_INTERNAL_FLCN_SET_VIDEO_EVENT_BUFFER_MEMORY_PARAMS_MESSAGE_ID (0x29U)
+
+typedef struct NV2080_CTRL_INTERNAL_FLCN_SET_VIDEO_EVENT_BUFFER_MEMORY_PARAMS {
+    NV_DECLARE_ALIGNED(NV2080_CTRL_INTERNAL_MEMDESC_INFO memDescInfo, 8);
+    NvU32  engDesc;
+    NvBool bEngineFound;
+} NV2080_CTRL_INTERNAL_FLCN_SET_VIDEO_EVENT_BUFFER_MEMORY_PARAMS;
+
 /*!
  * @ref NV0080_CTRL_CMD_GR_GET_INFO
  * @ref NV0080_CTRL_CMD_GR_GET_INFO_V2
@@ -1071,22 +1110,6 @@ typedef struct NV2080_CTRL_INTERNAL_STATIC_MIGMGR_GET_PARTITIONABLE_ENGINES_PARA
     NV_DECLARE_ALIGNED(NvU64 engineMask, 8);
 } NV2080_CTRL_INTERNAL_STATIC_MIGMGR_GET_PARTITIONABLE_ENGINES_PARAMS;
 
-
-/*!
- * NV2080_CTRL_INTERNAL_MEMDESC_INFO
- *
- * A generic container structure representing a memory region to be used as a
- * component of other control call parameters.
- *
- */
-typedef struct NV2080_CTRL_INTERNAL_MEMDESC_INFO {
-    NV_DECLARE_ALIGNED(NvU64 base, 8);
-    NV_DECLARE_ALIGNED(NvU64 size, 8);
-    NV_DECLARE_ALIGNED(NvU64 alignment, 8);
-    NvU32 addressSpace;
-    NvU32 cpuCacheAttrib;
-} NV2080_CTRL_INTERNAL_MEMDESC_INFO;
-
 #define NV2080_CTRL_INTERNAL_FIFO_MAX_RUNLIST_BUFFERS         2
 #define NV2080_CTRL_INTERNAL_FIFO_MAX_RUNLIST_ID              64
 /*!

src/nvidia-modeset/src/nvkms-attributes.c

@@ -67,6 +67,7 @@ static NvBool DpySetBacklightBrightness(NVDpyEvoRec *pDpyEvo, NvS64 brightness)
     params.subDeviceInstance = pDispEvo->displayOwner;
     params.displayId = nvDpyEvoGetConnectorId(pDpyEvo);
     params.brightness = brightness;
+    params.brightnessType = NV0073_CTRL_SPECIFIC_BACKLIGHT_BRIGHTNESS_TYPE_PERCENT100;
 
     ret = nvRmApiControl(
             nvEvoGlobal.clientHandle,
@@ -97,6 +98,7 @@ static NvBool DpyGetBacklightBrightness(const NVDpyEvoRec *pDpyEvo,
 
     params.subDeviceInstance = pDispEvo->displayOwner;
     params.displayId = nvDpyEvoGetConnectorId(pDpyEvo);
+    params.brightnessType = NV0073_CTRL_SPECIFIC_BACKLIGHT_BRIGHTNESS_TYPE_PERCENT100;
 
     ret = nvRmApiControl(
             nvEvoGlobal.clientHandle,

src/nvidia-modeset/src/nvkms-rm.c

@@ -5467,6 +5467,7 @@ void nvRmRegisterBacklight(NVDispEvoRec *pDispEvo)
 
         params.subDeviceInstance = pDispEvo->displayOwner;
         params.displayId         = displayId;
+        params.brightnessType = NV0073_CTRL_SPECIFIC_BACKLIGHT_BRIGHTNESS_TYPE_PERCENT100;
 
         status = nvRmApiControl(nvEvoGlobal.clientHandle,
                                 pDevEvo->displayCommonHandle,

src/nvidia-modeset/src/nvkms.c

@@ -6451,6 +6451,7 @@ NvBool nvKmsGetBacklight(NvU32 display_id, void *drv_priv, NvU32 *brightness)
 
     params.subDeviceInstance = pDispEvo->displayOwner;
     params.displayId = display_id;
+    params.brightnessType = NV0073_CTRL_SPECIFIC_BACKLIGHT_BRIGHTNESS_TYPE_PERCENT100;
 
     status = nvRmApiControl(nvEvoGlobal.clientHandle,
                             pDevEvo->displayCommonHandle,
@@ -6474,6 +6475,7 @@ NvBool nvKmsSetBacklight(NvU32 display_id, void *drv_priv, NvU32 brightness)
     params.subDeviceInstance = pDispEvo->displayOwner;
     params.displayId  = display_id;
     params.brightness = brightness;
+    params.brightnessType = NV0073_CTRL_SPECIFIC_BACKLIGHT_BRIGHTNESS_TYPE_PERCENT100;
 
     status = nvRmApiControl(nvEvoGlobal.clientHandle,
                             pDevEvo->displayCommonHandle,

src/nvidia/generated/g_gpu_nvoc.c

@@ -389,12 +389,6 @@ void __nvoc_init_dataField_OBJGPU(OBJGPU *pThis) {
     }
 
     pThis->bIsGspOwnedFaultBuffersEnabled = ((NvBool)(0 != 0));
-
-    // Hal field -- bVideoTraceLogSupported
-    if (( ((chipHal_HalVarIdx >> 5) == 1UL) && ((1UL << (chipHal_HalVarIdx & 0x1f)) & 0x11f0ffe0UL) )) /* ChipHal: TU102 | TU104 | TU106 | TU116 | TU117 | GA100 | GA102 | GA103 | GA104 | GA106 | GA107 | AD102 | AD103 | AD104 | AD106 | AD107 | GH100 */ 
-    {
-        pThis->bVideoTraceLogSupported = ((NvBool)(0 == 0));
-    }
 }
 
 NV_STATUS __nvoc_ctor_Object(Object* );

src/nvidia/generated/g_gpu_nvoc.h

@@ -99,6 +99,8 @@ typedef struct GPUATTACHARG GPUATTACHARG;
 #include "kernel/gpu/gr/fecs_event_list.h"
 #include "class/cl90cdfecs.h"
 
+#include "gpuvideo/videoeventlist.h"
+
 #include "gpu/gpu_fabric_probe.h"
 
 #include "nv_arch.h"
@@ -1199,6 +1201,8 @@ struct OBJGPU {
     EventBufferMap vgpuFecsTraceStagingBindings;
     FecsEventBufferBindMultiMap fecsEventBufferBindingsUid;
     TMR_EVENT *pFecsTimerEvent;
+    VideoEventBufferBindMultiMap videoEventBufferBindingsUid;
+    TMR_EVENT *pVideoTimerEvent;
     struct OBJVASPACE *pFabricVAS;
     NvBool bPipelinedPteMemEnabled;
     NvBool bIsBarPteInSysmemSupported;
@@ -1231,7 +1235,6 @@ struct OBJGPU {
     NvBool bGpuNvEncAv1Supported;
     _GPU_SLI_PEER peer[2];
     NvBool bIsGspOwnedFaultBuffersEnabled;
-    NvBool bVideoTraceLogSupported;
     _GPU_GC6_STATE gc6State;
 };
 
@@ -4073,17 +4076,6 @@ static inline NV_STATUS gpuGetConstructedFalcon(struct OBJGPU *pGpu, NvU32 arg0,
 #define gpuGetConstructedFalcon(pGpu, arg0, arg1) gpuGetConstructedFalcon_IMPL(pGpu, arg0, arg1)
 #endif //__nvoc_gpu_h_disabled
 
-NvBool gpuIsVideoTraceLogSupported_IMPL(struct OBJGPU *pGpu);
-
-#ifdef __nvoc_gpu_h_disabled
-static inline NvBool gpuIsVideoTraceLogSupported(struct OBJGPU *pGpu) {
-    NV_ASSERT_FAILED_PRECOMP("OBJGPU was disabled!");
-    return NV_FALSE;
-}
-#else //__nvoc_gpu_h_disabled
-#define gpuIsVideoTraceLogSupported(pGpu) gpuIsVideoTraceLogSupported_IMPL(pGpu)
-#endif //__nvoc_gpu_h_disabled
-
 NV_STATUS gpuGetSparseTextureComputeMode_IMPL(struct OBJGPU *pGpu, NvU32 *arg0, NvU32 *arg1, NvU32 *arg2);
 
 #ifdef __nvoc_gpu_h_disabled