diff --git a/doc/nvidia-settings.desktop b/doc/nvidia-settings.desktop
index c573029655a7c04cbb0b66bbd1c4f513e23ef39e..252d4fc61e546685b24266a3bbe49d28a4ac9831 100644
--- a/doc/nvidia-settings.desktop
+++ b/doc/nvidia-settings.desktop
@@ -7,6 +7,18 @@ Exec=__UTILS_PATH__/nvidia-settings
 Icon=__PIXMAP_PATH__/nvidia-settings.png
 Categories=__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__
 
+# Translation by Marcin Mikołajczak
+Name[pl]=Ustawienia serwera X NVIDIA
+Comment[pl]=Narzędzie konfiguracyjne dla ustawień serwera X NVIDIA
+
+# Translation by RDL
+Name[ru]=Параметры NVIDIA X Server
+Comment[ru]=Конфигурирование параметров NVIDIA X Server
+
+# Translation by Tractix
+Name[ro]=Setări NVIDIA X Server
+Comment[ro]=Configurează setările NVIDIA X Server
+
 # Translations provided by Sun Microsystems
 Name[de]=NVIDIA X-Server-Einstellungen
 Name[es]=Valores de configuración del servidor NVIDIA X
@@ -28,11 +40,3 @@ Comment[pt_BR]=Definir &configurações de gerenciamento de usuário...
 Comment[zh_CN]=配置 NVIDIA X 服务器设置
 Comment[zh_HK]=配置 NVIDIA X 伺服器設定
 Comment[zh_TW]=配置 NVIDIA X 伺服器設定
-
-# Translation by Marcin Mikołajczak
-Name[pl]=Ustawienia serwera X NVIDIA
-Comment[pl]=Narzędzie konfiguracyjne dla ustawień serwera X NVIDIA
-
-# Translation by RDL
-Name[ru]=Параметры NVIDIA X Server
-Comment[ru]=Конфигурирование параметров NVIDIA X Server
diff --git a/doc/version.mk b/doc/version.mk
index 634141a6768f9b92afa7bf08936c52df0d0dece6..d801b09105e1cde46aeee40707e160b4213bfadc 100644
--- a/doc/version.mk
+++ b/doc/version.mk
@@ -1,4 +1,4 @@
-NVIDIA_VERSION = 460.91.03
+NVIDIA_VERSION = 470.94
 
 # This file.
 VERSION_MK_FILE := $(lastword $(MAKEFILE_LIST))
diff --git a/samples/nv-control-events.c b/samples/nv-control-events.c
index 8df39faa0c35d013e6b311e37d698db242cd3598..49b7db432d2374fef4e159cbc0008969ea5e0b1c 100644
--- a/samples/nv-control-events.c
+++ b/samples/nv-control-events.c
@@ -26,7 +26,6 @@
  * demonstrates how to handle NV-CONTROL events.
  */
 
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/samples/nv-control-info.c b/samples/nv-control-info.c
index 23aac6765ffe944a7bfeeab685ea6da6350bff27..c9bbf8c856ee340e5dd4a101e604553d5fb6778b 100644
--- a/samples/nv-control-info.c
+++ b/samples/nv-control-info.c
@@ -27,7 +27,6 @@
  * present.
  */
 
-
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
diff --git a/samples/version.mk b/samples/version.mk
index 634141a6768f9b92afa7bf08936c52df0d0dece6..d801b09105e1cde46aeee40707e160b4213bfadc 100644
--- a/samples/version.mk
+++ b/samples/version.mk
@@ -1,4 +1,4 @@
-NVIDIA_VERSION = 460.91.03
+NVIDIA_VERSION = 470.94
 
 # This file.
 VERSION_MK_FILE := $(lastword $(MAKEFILE_LIST))
diff --git a/src/common-utils/gen-manpage-opts-helper.c b/src/common-utils/gen-manpage-opts-helper.c
index b41e2aa3e725fa3a785ca4ddb1a29787f120ec7d..56ba7b34d8542fd1333e4e9c26fcff01ad91c5d3 100644
--- a/src/common-utils/gen-manpage-opts-helper.c
+++ b/src/common-utils/gen-manpage-opts-helper.c
@@ -31,7 +31,8 @@
 
 static void print_option(const NVGetoptOption *o)
 {
-    char scratch[64], *s;
+    char scratch[64];
+    const char *s;
     int j, len;
 
     int italics, bold, omitWhiteSpace, firstchar;
diff --git a/src/common-utils/nvgetopt.h b/src/common-utils/nvgetopt.h
index 0262aac8f7d5e6011e4615883fb1c624ae5915fa..37da80e579421d8d82bcdbe53d0ef6ca173cbb54 100644
--- a/src/common-utils/nvgetopt.h
+++ b/src/common-utils/nvgetopt.h
@@ -117,8 +117,8 @@ typedef struct {
     const char *name;
     int val;
     unsigned int flags;
-    char *arg_name;     /* not used by nvgetopt() */
-    char *description;  /* not used by nvgetopt() */
+    const char *arg_name;     /* not used by nvgetopt() */
+    const char *description;  /* not used by nvgetopt() */
 } NVGetoptOption;
 
 
diff --git a/src/gtk+-2.x/ctkdisplayconfig-utils.c b/src/gtk+-2.x/ctkdisplayconfig-utils.c
index dc26f5dcb0ec566eeff7e1f1cf85a6872ecfba7e..392237399aac7f0deb16ea1cf5a7f491012391de 100644
--- a/src/gtk+-2.x/ctkdisplayconfig-utils.c
+++ b/src/gtk+-2.x/ctkdisplayconfig-utils.c
@@ -17,7 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses>.
  */
 
-
 #include <stdlib.h> /* malloc */
 #include <string.h> /* strlen,  strdup */
 #include <unistd.h> /* lseek, close */
@@ -2570,6 +2569,11 @@ void link_screen_to_gpu(nvScreenPtr screen, nvGpuPtr gpu)
         screen->max_displays = MIN(screen->max_displays, gpu->max_displays);
     }
 
+    if (gpu->multigpu_master_possible &&
+        !screen->display_owner_gpu->multigpu_master_possible) {
+        screen->display_owner_gpu = gpu;
+    }
+
     /* Set the display owner GPU. */
     if (screen->display_owner_gpu_id >= 0) {
         /* Link to the multi GPU display owner, if it is specified */
diff --git a/src/gtk+-2.x/ctkdisplayconfig.c b/src/gtk+-2.x/ctkdisplayconfig.c
index d6c15a3acc847211cc071f44e86c5d33a1a65804..40d82cce35a97a117992fa001db7ae632b955404 100644
--- a/src/gtk+-2.x/ctkdisplayconfig.c
+++ b/src/gtk+-2.x/ctkdisplayconfig.c
@@ -17,7 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses>.
  */
 
-
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
@@ -2631,21 +2630,21 @@ GtkTextBuffer *ctk_display_config_create_help(GtkTextTagTable *table,
 
 static void setup_mosaic_config(CtkDisplayConfig *ctk_object)
 {
-    nvDisplayPtr display = ctk_display_layout_get_selected_display
-        (CTK_DISPLAY_LAYOUT(ctk_object->obj_layout));
-    nvScreenPtr screen = ctk_display_layout_get_selected_screen
-        (CTK_DISPLAY_LAYOUT(ctk_object->obj_layout));
     nvGpuPtr gpu;
     const char *tooltip;
     const gchar *label;
-    gboolean display_gpu_support_mosaic = (display && display->gpu &&
-        display->gpu->mosaic_type != MOSAIC_TYPE_UNSUPPORTED);
-    gboolean screen_gpu_support_mosaic = (screen && screen->display_owner_gpu &&
-        screen->display_owner_gpu->mosaic_type != MOSAIC_TYPE_UNSUPPORTED);
+    nvLayoutPtr layout = ctk_object->layout;
+    int any_gpu_support_mosaic = FALSE;
 
+    for (gpu = layout->gpus; gpu; gpu = gpu->next_in_layout) {
+        if (gpu->mosaic_type != MOSAIC_TYPE_UNSUPPORTED) {
+            any_gpu_support_mosaic = TRUE;
+            break;
+        }
+    }
 
     if (!ctk_object->advanced_mode ||
-        (!display_gpu_support_mosaic && !screen_gpu_support_mosaic)) {
+        !any_gpu_support_mosaic) {
         gtk_widget_hide(ctk_object->chk_mosaic_enabled);
         gtk_widget_hide(ctk_object->btn_mosaic);
         return;
@@ -2653,12 +2652,6 @@ static void setup_mosaic_config(CtkDisplayConfig *ctk_object)
 
     gtk_widget_show(ctk_object->chk_mosaic_enabled);
 
-    if (display_gpu_support_mosaic) {
-        gpu = display->gpu;
-    } else {
-        gpu = screen->display_owner_gpu;
-    }
-
     /* Only show the Mosaic Config tool with SLI Mosaic and dialog exists */
     if (gpu->mosaic_type == MOSAIC_TYPE_SLI_MOSAIC &&
         ctk_object->dialog_mosaic) {
diff --git a/src/gtk+-2.x/ctkdisplayconfig.h b/src/gtk+-2.x/ctkdisplayconfig.h
index 802ac802ddfb458e7662f6a62d9d03aca332e0f3..7fcaefc32a14be70e16641059bd10814389ee557 100644
--- a/src/gtk+-2.x/ctkdisplayconfig.h
+++ b/src/gtk+-2.x/ctkdisplayconfig.h
@@ -20,7 +20,6 @@
 #ifndef __CTK_DISPLAYCONFIG_H__
 #define __CTK_DISPLAYCONFIG_H__
 
-
 #include "ctkevent.h"
 #include "ctkconfig.h"
 #include "ctkdisplaylayout.h"
diff --git a/src/gtk+-2.x/ctkdisplaydevice.c b/src/gtk+-2.x/ctkdisplaydevice.c
index ef112ac3a58c4c8a417b79a92979cf71d873ccf8..32cc8b957c06eb73c37a2968bd9184baaea20982 100644
--- a/src/gtk+-2.x/ctkdisplaydevice.c
+++ b/src/gtk+-2.x/ctkdisplaydevice.c
@@ -17,7 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses>.
  */
 
-
 #include <gtk/gtk.h>
 #include <NvCtrlAttributes.h>
 #include <string.h>
@@ -924,8 +923,6 @@ static gboolean update_vrr_enabled_info(InfoEntry *entry)
 
 
 
-
-
 static gboolean update_refresh_rate(InfoEntry *entry)
 {
     CtkDisplayDevice *ctk_object = entry->ctk_object;
diff --git a/src/gtk+-2.x/ctkdisplaylayout.h b/src/gtk+-2.x/ctkdisplaylayout.h
index fb2aef578da162dff228c5ce110c25d08c06d1de..4925e88cf7162f3dca7073e8142d36638cdf7795 100644
--- a/src/gtk+-2.x/ctkdisplaylayout.h
+++ b/src/gtk+-2.x/ctkdisplaylayout.h
@@ -20,7 +20,6 @@
 #ifndef __CTK_DISPLAYLAYOUT_H__
 #define __CTK_DISPLAYLAYOUT_H__
 
-
 #include "ctkevent.h"
 #include "ctkconfig.h"
 
diff --git a/src/gtk+-2.x/ctkevent.c b/src/gtk+-2.x/ctkevent.c
index 1f2b076e4447f83e0c70cc8bc651f4ff79ff10f6..5887ecb608c5fb3f3516cbf7a446852fb1b49306 100644
--- a/src/gtk+-2.x/ctkevent.c
+++ b/src/gtk+-2.x/ctkevent.c
@@ -28,7 +28,6 @@
  *   NV-CONTROL -> event -> glib -> CtkEvent -> signal -> GUI
  */
 
-
 #include <string.h>
 
 #include <gtk/gtk.h>
diff --git a/src/gtk+-2.x/ctkopengl.c b/src/gtk+-2.x/ctkopengl.c
index da270079869c5d713e8a9f32ac9ecb11b31d9e26..6b0ad554db8e51b3a98a0c5a1f48f45b8fa0e617 100644
--- a/src/gtk+-2.x/ctkopengl.c
+++ b/src/gtk+-2.x/ctkopengl.c
@@ -17,7 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses>.
  */
 
-
 #include <gtk/gtk.h>
 #include <NvCtrlAttributes.h>
 #include <stdlib.h>
diff --git a/src/gtk+-2.x/ctkopengl.h b/src/gtk+-2.x/ctkopengl.h
index bd404feb43d4648be4475c34bc6c5ff05b8f9fa2..e81a4aee14cfdc82df2d1e927209a78b52617b68 100644
--- a/src/gtk+-2.x/ctkopengl.h
+++ b/src/gtk+-2.x/ctkopengl.h
@@ -20,7 +20,6 @@
 #ifndef __CTK_OPENGL_H__
 #define __CTK_OPENGL_H__
 
-
 #include "ctkevent.h"
 #include "ctkconfig.h"
 
diff --git a/src/gtk+-2.x/ctkthermal.c b/src/gtk+-2.x/ctkthermal.c
index 1ffb8052fc77696468b9d5d292fca63a33255b90..48676fb590e42b102977af1e61017cec9d569f00 100644
--- a/src/gtk+-2.x/ctkthermal.c
+++ b/src/gtk+-2.x/ctkthermal.c
@@ -92,9 +92,8 @@ static const char *__thermal_sensor_reading_help =
 
 static const char * __enable_button_help =
 "The Enable GPU Fan Settings checkbox enables access to control GPU Fan "
-"Speed.  This option is available after enabling coolbits for GPU Fan control."
-"Note that controlling your GPU Fan Speed is not recommended and "
-"is done at your own risk. You should never have to enable this.";
+"Speed.  Manually configuring the GPU fan speed is not normally required; the "
+"speed should adjust automatically based on current temperature and load.";
 
 static const char * __fan_id_help =
 "This shows the GPU Fan's index.";
diff --git a/src/libXNVCtrl/NVCtrl.h b/src/libXNVCtrl/NVCtrl.h
index d98a722e355fe57bbc4bad4a9c5f08ff5c7798e6..fa84f86ebf5183646b969867585b1a7fee3d34cb 100644
--- a/src/libXNVCtrl/NVCtrl.h
+++ b/src/libXNVCtrl/NVCtrl.h
@@ -24,7 +24,6 @@
 #ifndef __NVCTRL_H
 #define __NVCTRL_H
 
-
 #include <stdint.h>
 
 /**************************************************************************/
diff --git a/src/libXNVCtrl/utils.mk b/src/libXNVCtrl/utils.mk
index af0e3d77e7109b63ec1e75ee327930211f9d10f8..e5ac3a2886d35c6cc5ce1abbf0a7ac1224e0d1c8 100644
--- a/src/libXNVCtrl/utils.mk
+++ b/src/libXNVCtrl/utils.mk
@@ -33,10 +33,11 @@
 ##############################################################################
 
 CC                    ?= gcc
+CXX                   ?= g++
 LD                    ?= ld
 AR                    ?= ar
-# only set these warnings and optimizations if CFLAGS is unset
-CFLAGS                ?= -Wall -O2
+# only set these warnings if CFLAGS is unset
+CFLAGS                ?= -Wall
 # always set these -f CFLAGS
 CFLAGS                += -fno-strict-aliasing -fno-omit-frame-pointer -Wformat=2
 CC_ONLY_CFLAGS        ?=
@@ -58,16 +59,27 @@ CFLAGS                += -Wno-unused-parameter
 HOST_CC_ONLY_CFLAGS   += -Wno-format-zero-length
 HOST_CFLAGS           += -Wno-unused-parameter
 
+DEBUG                 ?=
+DEVELOP               ?=
+
 ifeq ($(DEBUG),1)
   STRIP_CMD           ?= true
   DO_STRIP            ?=
   CFLAGS              += -O0 -g
   CFLAGS              += -DDEBUG=1
 else
-  STRIP_CMD           ?= strip
-  DO_STRIP            ?= 1
+  CFLAGS              += -O2
 endif
 
+ifeq ($(DEVELOP),1)
+  STRIP_CMD           ?= true
+  DO_STRIP            ?=
+  CFLAGS              += -DDEVELOP=1
+endif
+
+STRIP_CMD             ?= strip
+DO_STRIP              ?= 1
+
 INSTALL               ?= install
 INSTALL_BIN_ARGS      ?= -m 755
 INSTALL_LIB_ARGS      ?= -m 644
@@ -185,6 +197,21 @@ ifneq ($(_eval_available),T)
 endif
 
 
+##############################################################################
+# Test passing $(1) to $(CC).  If $(CC) succeeds, then echo $(1).
+#
+# Because this uses $(shell), it is best to use this to assign simply expanded
+# variables (e.g., ":=").
+#
+# Example usage:
+#  CONDITIONAL_CFLAGS := $(call TEST_CC_ARG, -ffoo)
+##############################################################################
+
+TEST_CC_ARG = \
+ $(shell $(CC) -c -x c /dev/null $(1) -o /dev/null > /dev/null 2>&1 && \
+   $(ECHO) $(1))
+
+
 ##############################################################################
 # define variables used when installing the open source utilities from
 # the source tarball
@@ -276,7 +303,7 @@ host_target = $(patsubst HOST,HOST_,$(patsubst TARGET,,$(1)))
 
 ifeq ($(NV_AUTO_DEPEND),1)
   AUTO_DEP_SUFFIX = -MMD -MF $$(@:.o=.d.to_be_processed) -MP -MT $$@ && \
-    $$(SED) -e "1,3s@ $$< @ @" < $$(@:.o=.d.to_be_processed) > $$(@:.o=.d)
+    $$(SED) -e "1,3s| $$< | |" < $$(@:.o=.d.to_be_processed) > $$(@:.o=.d)
 else
   AUTO_DEP_SUFFIX =
 endif
@@ -486,8 +513,9 @@ endif
 define GENERATE_NVIDSTRING
   # g_nvid_string.c depends on all objects except g_nvid_string.o, and version.mk
   $(NVIDSTRING): $$(filter-out $$(call BUILD_OBJECT_LIST,$$(NVIDSTRING)), $(3)) $$(VERSION_MK)
-	@$$(ECHO) "const char $(1)[] = \"nvidia id: NVIDIA $$(strip $(2)) for $$(TARGET_ARCH)  $$(NVIDIA_VERSION)  $$(NVIDSTRING_BUILD_TYPE_STRING)  (`$$(WHOAMI)`@`$$(HOSTNAME)`)  `$$(DATE)`\";" > $$@
-	@$$(ECHO) "const char *const p$$(strip $(1)) = $(1) + 11;" >> $$@;
+	$(at_if_quiet)$$(MKDIR) $$(dir $$@)
+	$(at_if_quiet)$$(ECHO) "const char $(1)[] = \"nvidia id: NVIDIA $$(strip $(2)) for $$(TARGET_ARCH)  $$(NVIDIA_VERSION)  $$(NVIDSTRING_BUILD_TYPE_STRING)  (`$$(WHOAMI)`@`$$(HOSTNAME)`)  `$$(DATE)`\";" > $$@
+	$(at_if_quiet)$$(ECHO) "const char *const p$$(strip $(1)) = $(1) + 11;" >> $$@;
 endef
 
 
@@ -510,6 +538,7 @@ endef
 
 define READ_ONLY_OBJECT_FROM_FILE_RULE
   $$(OUTPUTDIR)/$$(notdir $(1)).o: $(1)
+	$(at_if_quiet)$$(MKDIR) $$(OUTPUTDIR)
 	$(at_if_quiet)cd $$(dir $(1)); \
 	$$(call quiet_cmd_no_at,LD) -r -z noexecstack --format=binary \
 	    $$(notdir $(1)) -o $$(OUTPUTDIR_ABSOLUTE)/$$(notdir $$@)
diff --git a/src/libXNVCtrl/version.mk b/src/libXNVCtrl/version.mk
index 634141a6768f9b92afa7bf08936c52df0d0dece6..d801b09105e1cde46aeee40707e160b4213bfadc 100644
--- a/src/libXNVCtrl/version.mk
+++ b/src/libXNVCtrl/version.mk
@@ -1,4 +1,4 @@
-NVIDIA_VERSION = 460.91.03
+NVIDIA_VERSION = 470.94
 
 # This file.
 VERSION_MK_FILE := $(lastword $(MAKEFILE_LIST))
diff --git a/src/libXNVCtrlAttributes/NvCtrlAttributesNvml.c b/src/libXNVCtrlAttributes/NvCtrlAttributesNvml.c
index 6fab1092439c9e5395f7e09661d6a25c79e2296f..ad4c83edb242e2fda80b0077e309d6d53e82add7 100644
--- a/src/libXNVCtrlAttributes/NvCtrlAttributesNvml.c
+++ b/src/libXNVCtrlAttributes/NvCtrlAttributesNvml.c
@@ -206,7 +206,7 @@ static Bool LoadNvml(NvCtrlNvmlAttributes *nvml)
 #define GET_SYMBOL_OPTIONAL(_proc, _name)             \
     nvml->lib._proc = dlsym(nvml->lib.handle, _name); 
     
-    GET_SYMBOL_OPTIONAL(deviceGetGridLicensableFeatures, "nvmlDeviceGetGridLicensableFeatures_v3");
+    GET_SYMBOL_OPTIONAL(deviceGetGridLicensableFeatures, "nvmlDeviceGetGridLicensableFeatures_v4");
 #undef GET_SYMBOL_OPTIONAL
 
     ret = nvml->lib.init();
diff --git a/src/libXNVCtrlAttributes/NvCtrlAttributesPrivate.h b/src/libXNVCtrlAttributes/NvCtrlAttributesPrivate.h
index 51d538c5f954ae8cdee60779343d3f0ac8c61127..dacf506812326b815044ee5b9ccd9cefaa904e82 100644
--- a/src/libXNVCtrlAttributes/NvCtrlAttributesPrivate.h
+++ b/src/libXNVCtrlAttributes/NvCtrlAttributesPrivate.h
@@ -177,7 +177,7 @@ struct __NvCtrlNvmlAttributes {
         typeof(nvmlDeviceGetMaxPcieLinkGeneration)      (*deviceGetMaxPcieLinkGeneration);
         typeof(nvmlDeviceGetMaxPcieLinkWidth)           (*deviceGetMaxPcieLinkWidth);
         typeof(nvmlDeviceGetVirtualizationMode)         (*deviceGetVirtualizationMode);
-        typeof(nvmlDeviceGetGridLicensableFeatures_v3)  (*deviceGetGridLicensableFeatures);
+        typeof(nvmlDeviceGetGridLicensableFeatures_v4)  (*deviceGetGridLicensableFeatures);
 
     } lib;
 
diff --git a/src/nvml.h b/src/nvml.h
index 58de790c22156b008ce17fd66c26bd7015af860f..4bd1a9e532eb3b4e0ee3a5705aa6c29d49df563c 100644
--- a/src/nvml.h
+++ b/src/nvml.h
@@ -1,42 +1,42 @@
 /*
- * Copyright 1993-2020 NVIDIA Corporation.  All rights reserved.
+ * Copyright 1993-2021 NVIDIA Corporation.  All rights reserved.
  *
- * NOTICE TO USER:   
+ * NOTICE TO USER:
  *
- * This source code is subject to NVIDIA ownership rights under U.S. and 
- * international Copyright laws.  Users and possessors of this source code 
- * are hereby granted a nonexclusive, royalty-free license to use this code 
+ * This source code is subject to NVIDIA ownership rights under U.S. and
+ * international Copyright laws.  Users and possessors of this source code
+ * are hereby granted a nonexclusive, royalty-free license to use this code
  * in individual and commercial software.
  *
- * NVIDIA MAKES NO REPRESENTATION ABOUT THE SUITABILITY OF THIS SOURCE 
- * CODE FOR ANY PURPOSE.  IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR 
- * IMPLIED WARRANTY OF ANY KIND.  NVIDIA DISCLAIMS ALL WARRANTIES WITH 
- * REGARD TO THIS SOURCE CODE, INCLUDING ALL IMPLIED WARRANTIES OF 
+ * NVIDIA MAKES NO REPRESENTATION ABOUT THE SUITABILITY OF THIS SOURCE
+ * CODE FOR ANY PURPOSE.  IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR
+ * IMPLIED WARRANTY OF ANY KIND.  NVIDIA DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOURCE CODE, INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY, NONINFRINGEMENT, AND FITNESS FOR A PARTICULAR PURPOSE.
- * IN NO EVENT SHALL NVIDIA BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL, 
- * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS 
- * OF USE, DATA OR PROFITS,  WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
- * OR OTHER TORTIOUS ACTION,  ARISING OUT OF OR IN CONNECTION WITH THE USE 
- * OR PERFORMANCE OF THIS SOURCE CODE.  
- *
- * U.S. Government End Users.   This source code is a "commercial item" as 
- * that term is defined at  48 C.F.R. 2.101 (OCT 1995), consisting  of 
- * "commercial computer  software"  and "commercial computer software 
- * documentation" as such terms are  used in 48 C.F.R. 12.212 (SEPT 1995) 
- * and is provided to the U.S. Government only as a commercial end item.  
- * Consistent with 48 C.F.R.12.212 and 48 C.F.R. 227.7202-1 through 
- * 227.7202-4 (JUNE 1995), all U.S. Government End Users acquire the 
- * source code with only those rights set forth herein. 
- *
- * Any use of this source code in individual and commercial software must 
+ * IN NO EVENT SHALL NVIDIA BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL,
+ * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS,  WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION,  ARISING OUT OF OR IN CONNECTION WITH THE USE
+ * OR PERFORMANCE OF THIS SOURCE CODE.
+ *
+ * U.S. Government End Users.   This source code is a "commercial item" as
+ * that term is defined at  48 C.F.R. 2.101 (OCT 1995), consisting  of
+ * "commercial computer  software"  and "commercial computer software
+ * documentation" as such terms are  used in 48 C.F.R. 12.212 (SEPT 1995)
+ * and is provided to the U.S. Government only as a commercial end item.
+ * Consistent with 48 C.F.R.12.212 and 48 C.F.R. 227.7202-1 through
+ * 227.7202-4 (JUNE 1995), all U.S. Government End Users acquire the
+ * source code with only those rights set forth herein.
+ *
+ * Any use of this source code in individual and commercial software must
  * include, in the user documentation and internal comments to the code,
  * the above Disclaimer and U.S. Government End Users Notice.
  */
 
-/* 
+/*
 NVML API Reference
 
-The NVIDIA Management Library (NVML) is a C-based programmatic interface for monitoring and 
+The NVIDIA Management Library (NVML) is a C-based programmatic interface for monitoring and
 managing various states within NVIDIA Tesla &tm; GPUs. It is intended to be a platform for building
 3rd party applications, and is also the underlying library for the NVIDIA-supported nvidia-smi
 tool. NVML is thread-safe so it is safe to make simultaneous NVML calls from multiple threads.
@@ -58,7 +58,7 @@ Supported products:
     - All Geforce products, starting with the Fermi architecture
 
 The NVML library can be found at \%ProgramW6432\%\\"NVIDIA Corporation"\\NVSMI\\ on Windows. It is
-not be added to the system path by default. To dynamically link to NVML, add this path to the PATH 
+not be added to the system path by default. To dynamically link to NVML, add this path to the PATH
 environmental variable. To dynamically load NVML, call LoadLibrary with this path.
 
 On Linux the NVML library will be found on the standard library path. For 64 bit Linux, both the 32 bit
@@ -103,19 +103,24 @@ extern "C" {
  * guard if you need to support older versions of the API
  */
 #ifndef NVML_NO_UNVERSIONED_FUNC_DEFS
-    #define nvmlInit                                nvmlInit_v2
-    #define nvmlDeviceGetPciInfo                    nvmlDeviceGetPciInfo_v3
-    #define nvmlDeviceGetCount                      nvmlDeviceGetCount_v2
-    #define nvmlDeviceGetHandleByIndex              nvmlDeviceGetHandleByIndex_v2
-    #define nvmlDeviceGetHandleByPciBusId           nvmlDeviceGetHandleByPciBusId_v2
-    #define nvmlDeviceGetNvLinkRemotePciInfo        nvmlDeviceGetNvLinkRemotePciInfo_v2
-    #define nvmlDeviceRemoveGpu                     nvmlDeviceRemoveGpu_v2
-    #define nvmlDeviceGetGridLicensableFeatures     nvmlDeviceGetGridLicensableFeatures_v3
-    #define nvmlEventSetWait                        nvmlEventSetWait_v2
-    #define nvmlDeviceGetAttributes                 nvmlDeviceGetAttributes_v2
-    #define nvmlComputeInstanceGetInfo              nvmlComputeInstanceGetInfo_v2
-    #define nvmlDeviceGetComputeRunningProcesses    nvmlDeviceGetComputeRunningProcesses_v2
-    #define nvmlDeviceGetGraphicsRunningProcesses   nvmlDeviceGetGraphicsRunningProcesses_v2
+    #define nvmlInit                                    nvmlInit_v2
+    #define nvmlDeviceGetPciInfo                        nvmlDeviceGetPciInfo_v3
+    #define nvmlDeviceGetCount                          nvmlDeviceGetCount_v2
+    #define nvmlDeviceGetHandleByIndex                  nvmlDeviceGetHandleByIndex_v2
+    #define nvmlDeviceGetHandleByPciBusId               nvmlDeviceGetHandleByPciBusId_v2
+    #define nvmlDeviceGetNvLinkRemotePciInfo            nvmlDeviceGetNvLinkRemotePciInfo_v2
+    #define nvmlDeviceRemoveGpu                         nvmlDeviceRemoveGpu_v2
+    #define nvmlDeviceGetGridLicensableFeatures         nvmlDeviceGetGridLicensableFeatures_v4
+    #define nvmlEventSetWait                            nvmlEventSetWait_v2
+    #define nvmlDeviceGetAttributes                     nvmlDeviceGetAttributes_v2
+    #define nvmlComputeInstanceGetInfo                  nvmlComputeInstanceGetInfo_v2
+    #define nvmlDeviceGetComputeRunningProcesses        nvmlDeviceGetComputeRunningProcesses_v2
+    #define nvmlDeviceGetGraphicsRunningProcesses       nvmlDeviceGetGraphicsRunningProcesses_v2
+    #define nvmlDeviceGetMPSComputeRunningProcesses     nvmlDeviceGetMPSComputeRunningProcesses_v2
+    #define nvmlBlacklistDeviceInfo_t                   nvmlExcludedDeviceInfo_t
+    #define nvmlGetBlacklistDeviceCount                 nvmlGetExcludedDeviceCount
+    #define nvmlGetBlacklistDeviceInfoByIndex           nvmlGetExcludedDeviceInfoByIndex
+    #define nvmlDeviceGetGpuInstancePossiblePlacements  nvmlDeviceGetGpuInstancePossiblePlacements_v2
 #endif // #ifndef NVML_NO_UNVERSIONED_FUNC_DEFS
 
 /***************************************************************************************************/
@@ -184,7 +189,7 @@ typedef struct nvmlPciInfo_st
  * @deprecated  Different GPU families can have different memory error counters
  *              See \ref nvmlDeviceGetMemoryErrorCounter
  */
-typedef struct nvmlEccErrorCounts_st 
+typedef struct nvmlEccErrorCounts_st
 {
     unsigned long long l1Cache;      //!< L1 cache errors
     unsigned long long l2Cache;      //!< L2 cache errors
@@ -192,20 +197,20 @@ typedef struct nvmlEccErrorCounts_st
     unsigned long long registerFile; //!< Register file errors
 } nvmlEccErrorCounts_t;
 
-/** 
+/**
  * Utilization information for a device.
  * Each sample period may be between 1 second and 1/6 second, depending on the product being queried.
  */
-typedef struct nvmlUtilization_st 
+typedef struct nvmlUtilization_st
 {
     unsigned int gpu;                //!< Percent of time over the past sample period during which one or more kernels was executing on the GPU
     unsigned int memory;             //!< Percent of time over the past sample period during which global (device) memory was being read or written
 } nvmlUtilization_t;
 
-/** 
+/**
  * Memory allocation information for a device.
  */
-typedef struct nvmlMemory_st 
+typedef struct nvmlMemory_st
 {
     unsigned long long total;        //!< Total installed FB memory (in bytes)
     unsigned long long free;         //!< Unallocated FB memory (in bytes)
@@ -222,6 +227,18 @@ typedef struct nvmlBAR1Memory_st
     unsigned long long bar1Used;     //!< Allocated Used Memory (in bytes)
 }nvmlBAR1Memory_t;
 
+/**
+ * Information about running compute processes on the GPU, legacy version
+ * for older versions of the API.
+ */
+typedef struct nvmlProcessInfo_v1_st
+{
+    unsigned int        pid;                //!< Process ID
+    unsigned long long  usedGpuMemory;      //!< Amount of used GPU memory in bytes.
+                                            //! Under WDDM, \ref NVML_VALUE_NOT_AVAILABLE is always reported
+                                            //! because Windows KMD manages all the memory and not the NVIDIA driver
+} nvmlProcessInfo_v1_t;
+
 /**
  * Information about running compute processes on the GPU
  */
@@ -271,11 +288,11 @@ typedef struct nvmlRowRemapperHistogramValues_st
 typedef enum nvmlBridgeChipType_enum
 {
     NVML_BRIDGE_CHIP_PLX = 0,
-    NVML_BRIDGE_CHIP_BRO4 = 1           
+    NVML_BRIDGE_CHIP_BRO4 = 1
 }nvmlBridgeChipType_t;
 
 /**
- * Maximum number of NvLink links supported 
+ * Maximum number of NvLink links supported
  */
 #define NVML_NVLINK_MAX_LINKS 12
 
@@ -297,7 +314,7 @@ typedef enum nvmlNvLinkUtilizationCountUnits_enum
  *  ** this is ONLY applicable with the units as packets or bytes
  *  ** as specified in \a nvmlNvLinkUtilizationCountUnits_t
  *  ** all packet filter descriptions are target GPU centric
- *  ** these can be "OR'd" together 
+ *  ** these can be "OR'd" together
  */
 typedef enum nvmlNvLinkUtilizationCountPktTypes_enum
 {
@@ -312,7 +329,7 @@ typedef enum nvmlNvLinkUtilizationCountPktTypes_enum
     NVML_NVLINK_COUNTER_PKTFILTER_ALL        = 0xFF     // all packets
 } nvmlNvLinkUtilizationCountPktTypes_t;
 
-/** 
+/**
  * Struct to define the NVLINK counter controls
  */
 typedef struct nvmlNvLinkUtilizationControl_st
@@ -351,6 +368,17 @@ typedef enum nvmlNvLinkErrorCounter_enum
     NVML_NVLINK_ERROR_COUNT
 } nvmlNvLinkErrorCounter_t;
 
+/**
+ * Enum to represent NvLink's remote device type
+ */
+typedef enum nvmlIntNvLinkDeviceType_enum
+{
+    NVML_NVLINK_DEVICE_TYPE_GPU     = 0x00,
+    NVML_NVLINK_DEVICE_TYPE_IBMNPU  = 0x01,
+    NVML_NVLINK_DEVICE_TYPE_SWITCH  = 0x02,
+    NVML_NVLINK_DEVICE_TYPE_UNKNOWN = 0xFF
+} nvmlIntNvLinkDeviceType_t;
+
 /**
  * Represents level relationships within a system between two GPUs
  * The enums are spaced to allow for future relationships
@@ -362,7 +390,7 @@ typedef enum nvmlGpuLevel_enum
     NVML_TOPOLOGY_MULTIPLE           = 20, // all devices that need not traverse a host bridge
     NVML_TOPOLOGY_HOSTBRIDGE         = 30, // all devices that are connected to the same host bridge
     NVML_TOPOLOGY_NODE               = 40, // all devices that are connected to the same NUMA node but possibly multiple host bridges
-    NVML_TOPOLOGY_SYSTEM             = 50, // all devices in the system
+    NVML_TOPOLOGY_SYSTEM             = 50  // all devices in the system
 
     // there is purposefully no COUNT here because of the need for spacing above
 } nvmlGpuTopologyLevel_t;
@@ -404,12 +432,12 @@ typedef enum nvmlGpuP2PCapsIndex_enum
  */
 typedef struct nvmlBridgeChipInfo_st
 {
-    nvmlBridgeChipType_t type;                  //!< Type of Bridge Chip 
+    nvmlBridgeChipType_t type;                  //!< Type of Bridge Chip
     unsigned int fwVersion;                     //!< Firmware Version. 0=Version is unavailable
 }nvmlBridgeChipInfo_t;
 
 /**
- * This structure stores the complete Hierarchy of the Bridge Chip within the board. The immediate 
+ * This structure stores the complete Hierarchy of the Bridge Chip within the board. The immediate
  * bridge is stored at index 0 of bridgeInfoList, parent to immediate bridge is at index 1 and so forth.
  */
 typedef struct nvmlBridgeChipHierarchy_st
@@ -427,12 +455,12 @@ typedef enum nvmlSamplingType_enum
     NVML_GPU_UTILIZATION_SAMPLES    = 1, //!< To represent percent of time during which one or more kernels was executing on the GPU
     NVML_MEMORY_UTILIZATION_SAMPLES = 2, //!< To represent percent of time during which global (device) memory was being read or written
     NVML_ENC_UTILIZATION_SAMPLES    = 3, //!< To represent percent of time during which NVENC remains busy
-    NVML_DEC_UTILIZATION_SAMPLES    = 4, //!< To represent percent of time during which NVDEC remains busy            
+    NVML_DEC_UTILIZATION_SAMPLES    = 4, //!< To represent percent of time during which NVDEC remains busy
     NVML_PROCESSOR_CLK_SAMPLES      = 5, //!< To represent processor clock samples
     NVML_MEMORY_CLK_SAMPLES         = 6, //!< To represent memory clock samples
-            
+
     // Keep this last
-    NVML_SAMPLINGTYPE_COUNT               
+    NVML_SAMPLINGTYPE_COUNT
 }nvmlSamplingType_t;
 
 /**
@@ -442,7 +470,7 @@ typedef enum nvmlPcieUtilCounter_enum
 {
     NVML_PCIE_UTIL_TX_BYTES             = 0, // 1KB granularity
     NVML_PCIE_UTIL_RX_BYTES             = 1, // 1KB granularity
-    
+
     // Keep this last
     NVML_PCIE_UTIL_COUNT
 } nvmlPcieUtilCounter_t;
@@ -450,7 +478,7 @@ typedef enum nvmlPcieUtilCounter_enum
 /**
  * Represents the type for sample value returned
  */
-typedef enum nvmlValueType_enum 
+typedef enum nvmlValueType_enum
 {
     NVML_VALUE_TYPE_DOUBLE = 0,
     NVML_VALUE_TYPE_UNSIGNED_INT = 1,
@@ -478,14 +506,14 @@ typedef union nvmlValue_st
 /**
  * Information for Sample
  */
-typedef struct nvmlSample_st 
+typedef struct nvmlSample_st
 {
     unsigned long long timeStamp;       //!< CPU Timestamp in microseconds
     nvmlValue_t sampleValue;        //!< Sample Value
 }nvmlSample_t;
 
 /**
- * Represents type of perf policy for which violation times can be queried 
+ * Represents type of perf policy for which violation times can be queried
  */
 typedef enum nvmlPerfPolicyType_enum
 {
@@ -520,26 +548,26 @@ typedef struct nvmlViolationTime_st
  */
 /***************************************************************************************************/
 
-/** 
- * Generic enable/disable enum. 
+/**
+ * Generic enable/disable enum.
  */
-typedef enum nvmlEnableState_enum 
+typedef enum nvmlEnableState_enum
 {
-    NVML_FEATURE_DISABLED    = 0,     //!< Feature disabled 
+    NVML_FEATURE_DISABLED    = 0,     //!< Feature disabled
     NVML_FEATURE_ENABLED     = 1      //!< Feature enabled
 } nvmlEnableState_t;
 
 //! Generic flag used to specify the default behavior of some functions. See description of particular functions for details.
-#define nvmlFlagDefault     0x00      
+#define nvmlFlagDefault     0x00
 //! Generic flag used to force some behavior. See description of particular functions for details.
-#define nvmlFlagForce       0x01      
+#define nvmlFlagForce       0x01
 
 /**
  *  * The Brand of the GPU
  *   */
 typedef enum nvmlBrandType_enum
 {
-    NVML_BRAND_UNKNOWN          = 0, 
+    NVML_BRAND_UNKNOWN          = 0,
     NVML_BRAND_QUADRO           = 1,
     NVML_BRAND_TESLA            = 2,
     NVML_BRAND_NVS              = 3,
@@ -584,35 +612,75 @@ typedef enum nvmlTemperatureThresholds_enum
     NVML_TEMPERATURE_THRESHOLD_COUNT
 } nvmlTemperatureThresholds_t;
 
-/** 
- * Temperature sensors. 
+/**
+ * Temperature sensors.
  */
-typedef enum nvmlTemperatureSensors_enum 
+typedef enum nvmlTemperatureSensors_enum
 {
     NVML_TEMPERATURE_GPU      = 0,    //!< Temperature sensor for the GPU die
-    
+
     // Keep this last
     NVML_TEMPERATURE_COUNT
 } nvmlTemperatureSensors_t;
 
-/** 
- * Compute mode. 
+/**
+ * Compute mode.
  *
  * NVML_COMPUTEMODE_EXCLUSIVE_PROCESS was added in CUDA 4.0.
- * Earlier CUDA versions supported a single exclusive mode, 
+ * Earlier CUDA versions supported a single exclusive mode,
  * which is equivalent to NVML_COMPUTEMODE_EXCLUSIVE_THREAD in CUDA 4.0 and beyond.
  */
-typedef enum nvmlComputeMode_enum 
+typedef enum nvmlComputeMode_enum
 {
     NVML_COMPUTEMODE_DEFAULT           = 0,  //!< Default compute mode -- multiple contexts per device
     NVML_COMPUTEMODE_EXCLUSIVE_THREAD  = 1,  //!< Support Removed
     NVML_COMPUTEMODE_PROHIBITED        = 2,  //!< Compute-prohibited mode -- no contexts per device
     NVML_COMPUTEMODE_EXCLUSIVE_PROCESS = 3,  //!< Compute-exclusive-process mode -- only one context per device, usable from multiple threads at a time
-    
+
     // Keep this last
     NVML_COMPUTEMODE_COUNT
 } nvmlComputeMode_t;
 
+/**
+ * Max Clock Monitors available
+ */
+#define MAX_CLK_DOMAINS			32
+
+/**
+ * Clock Monitor error types
+ */
+typedef struct nvmlClkMonFaultInfo_struct {
+    /**
+     * The Domain which faulted
+     */
+    unsigned int   clkApiDomain;
+
+    /**
+     * Faults Information
+     */
+    unsigned int   clkDomainFaultMask;
+} nvmlClkMonFaultInfo_t;
+
+/**
+ * Clock Monitor Status
+ */
+typedef struct nvmlClkMonStatus_status {
+    /**
+     * Fault status Indicator
+     */
+    unsigned int  bGlobalStatus;
+
+    /**
+     * Total faulted domain numbers
+     */
+    unsigned int   clkMonListSize;
+
+    /**
+     * The fault Information structure
+     */
+    nvmlClkMonFaultInfo_t clkMonList[MAX_CLK_DOMAINS];
+} nvmlClkMonStatus_t;
+
 /** 
  * ECC bit types.
  *
@@ -641,54 +709,54 @@ typedef enum nvmlMemoryErrorType_enum
 {
     /**
      * A memory error that was corrected
-     * 
+     *
      * For ECC errors, these are single bit errors
      * For Texture memory, these are errors fixed by resend
      */
     NVML_MEMORY_ERROR_TYPE_CORRECTED = 0,
     /**
      * A memory error that was not corrected
-     * 
+     *
      * For ECC errors, these are double bit errors
      * For Texture memory, these are errors where the resend fails
      */
     NVML_MEMORY_ERROR_TYPE_UNCORRECTED = 1,
-    
-    
+
+
     // Keep this last
     NVML_MEMORY_ERROR_TYPE_COUNT //!< Count of memory error types
 
 } nvmlMemoryErrorType_t;
 
-/** 
- * ECC counter types. 
+/**
+ * ECC counter types.
  *
  * Note: Volatile counts are reset each time the driver loads. On Windows this is once per boot. On Linux this can be more frequent.
- *       On Linux the driver unloads when no active clients exist. If persistence mode is enabled or there is always a driver 
+ *       On Linux the driver unloads when no active clients exist. If persistence mode is enabled or there is always a driver
  *       client active (e.g. X11), then Linux also sees per-boot behavior. If not, volatile counts are reset each time a compute app
  *       is run.
  */
-typedef enum nvmlEccCounterType_enum 
+typedef enum nvmlEccCounterType_enum
 {
     NVML_VOLATILE_ECC      = 0,      //!< Volatile counts are reset each time the driver loads.
     NVML_AGGREGATE_ECC     = 1,      //!< Aggregate counts persist across reboots (i.e. for the lifetime of the device)
-    
+
     // Keep this last
     NVML_ECC_COUNTER_TYPE_COUNT      //!< Count of memory counter types
 } nvmlEccCounterType_t;
 
-/** 
- * Clock types. 
- * 
+/**
+ * Clock types.
+ *
  * All speeds are in Mhz.
  */
-typedef enum nvmlClockType_enum 
+typedef enum nvmlClockType_enum
 {
     NVML_CLOCK_GRAPHICS  = 0,        //!< Graphics clock domain
     NVML_CLOCK_SM        = 1,        //!< SM clock domain
     NVML_CLOCK_MEM       = 2,        //!< Memory clock domain
     NVML_CLOCK_VIDEO     = 3,        //!< Video encoder/decoder clock domain
-    
+
     // Keep this last
     NVML_CLOCK_COUNT //!< Count of clock types
 } nvmlClockType_t;
@@ -708,12 +776,12 @@ typedef enum nvmlClockId_enum
     NVML_CLOCK_ID_COUNT //!< Count of Clock Ids.
 } nvmlClockId_t;
 
-/** 
- * Driver models. 
+/**
+ * Driver models.
  *
  * Windows only.
  */
-typedef enum nvmlDriverModel_enum 
+typedef enum nvmlDriverModel_enum
 {
     NVML_DRIVER_WDDM      = 0,       //!< WDDM driver model -- GPU treated as a display device
     NVML_DRIVER_WDM       = 1        //!< WDM (TCC) model (recommended) -- GPU treated as a generic device
@@ -722,10 +790,10 @@ typedef enum nvmlDriverModel_enum
 /**
  * Allowed PStates.
  */
-typedef enum nvmlPStates_enum 
+typedef enum nvmlPStates_enum
 {
     NVML_PSTATE_0               = 0,       //!< Performance state 0 -- Maximum Performance
-    NVML_PSTATE_1               = 1,       //!< Performance state 1 
+    NVML_PSTATE_1               = 1,       //!< Performance state 1
     NVML_PSTATE_2               = 2,       //!< Performance state 2
     NVML_PSTATE_3               = 3,       //!< Performance state 3
     NVML_PSTATE_4               = 4,       //!< Performance state 4
@@ -739,7 +807,7 @@ typedef enum nvmlPStates_enum
     NVML_PSTATE_12              = 12,      //!< Performance state 12
     NVML_PSTATE_13              = 13,      //!< Performance state 13
     NVML_PSTATE_14              = 14,      //!< Performance state 14
-    NVML_PSTATE_15              = 15,      //!< Performance state 15 -- Minimum Performance 
+    NVML_PSTATE_15              = 15,      //!< Performance state 15 -- Minimum Performance
     NVML_PSTATE_UNKNOWN         = 32       //!< Unknown performance state
 } nvmlPstates_t;
 
@@ -761,10 +829,10 @@ typedef enum nvmlGom_enum
                                             //!< high bandwidth double precision
 } nvmlGpuOperationMode_t;
 
-/** 
+/**
  * Available infoROM objects.
  */
-typedef enum nvmlInforomObject_enum 
+typedef enum nvmlInforomObject_enum
 {
     NVML_INFOROM_OEM            = 0,       //!< An object defined by OEM
     NVML_INFOROM_ECC            = 1,       //!< The ECC object determining the level of ECC support
@@ -774,10 +842,10 @@ typedef enum nvmlInforomObject_enum
     NVML_INFOROM_COUNT                     //!< This counts the number of infoROM objects the driver knows about
 } nvmlInforomObject_t;
 
-/** 
- * Return values for NVML API calls. 
+/**
+ * Return values for NVML API calls.
  */
-typedef enum nvmlReturn_enum 
+typedef enum nvmlReturn_enum
 {
     // cppcheck-suppress *
     NVML_SUCCESS = 0,                        //!< The operation was successful
@@ -804,6 +872,7 @@ typedef enum nvmlReturn_enum
     NVML_ERROR_NO_DATA = 21,                 //!< No data
     NVML_ERROR_VGPU_ECC_NOT_SUPPORTED = 22,  //!< The requested vgpu operation is not available on target device, becasue ECC is enabled
     NVML_ERROR_INSUFFICIENT_RESOURCES = 23,  //!< Ran out of critical resources, other than memory
+    NVML_ERROR_FREQ_NOT_SUPPORTED = 24,  //!< Ran out of critical resources, other than memory
     NVML_ERROR_UNKNOWN = 999                 //!< An internal driver error occurred
 } nvmlReturn_t;
 
@@ -842,7 +911,7 @@ typedef enum nvmlPageRetirementCause_enum
  */
 typedef enum nvmlRestrictedAPI_enum
 {
-    NVML_RESTRICTED_API_SET_APPLICATION_CLOCKS = 0,   //!< APIs that change application clocks, see nvmlDeviceSetApplicationsClocks 
+    NVML_RESTRICTED_API_SET_APPLICATION_CLOCKS = 0,   //!< APIs that change application clocks, see nvmlDeviceSetApplicationsClocks
                                                       //!< and see nvmlDeviceResetApplicationsClocks
     NVML_RESTRICTED_API_SET_AUTO_BOOSTED_CLOCKS = 1,  //!< APIs that enable/disable Auto Boosted clocks
                                                       //!< see nvmlDeviceSetAutoBoostedClocksEnabled
@@ -884,7 +953,7 @@ typedef enum nvmlGpuVirtualizationMode {
     NVML_GPU_VIRTUALIZATION_MODE_PASSTHROUGH = 1,  //!< Device is associated with GPU-Passthorugh
     NVML_GPU_VIRTUALIZATION_MODE_VGPU = 2,  //!< Device is associated with vGPU inside virtual machine.
     NVML_GPU_VIRTUALIZATION_MODE_HOST_VGPU = 3,  //!< Device is associated with VGX hypervisor in vGPU mode
-    NVML_GPU_VIRTUALIZATION_MODE_HOST_VSGA = 4,  //!< Device is associated with VGX hypervisor in vSGA mode
+    NVML_GPU_VIRTUALIZATION_MODE_HOST_VSGA = 4   //!< Device is associated with VGX hypervisor in vSGA mode
 } nvmlGpuVirtualizationMode_t;
 
 /**
@@ -901,7 +970,7 @@ typedef enum nvmlHostVgpuMode_enum
  */
 typedef enum nvmlVgpuVmIdType {
     NVML_VGPU_VM_ID_DOMAIN_ID = 0, //!< VM ID represents DOMAIN ID
-    NVML_VGPU_VM_ID_UUID = 1,      //!< VM ID represents UUID
+    NVML_VGPU_VM_ID_UUID = 1       //!< VM ID represents UUID
 } nvmlVgpuVmIdType_t;
 
 /**
@@ -910,7 +979,7 @@ typedef enum nvmlVgpuVmIdType {
 typedef enum nvmlVgpuGuestInfoState_enum
 {
     NVML_VGPU_INSTANCE_GUEST_INFO_STATE_UNINITIALIZED = 0,  //!< Guest-dependent fields uninitialized
-    NVML_VGPU_INSTANCE_GUEST_INFO_STATE_INITIALIZED   = 1,  //!< Guest-dependent fields initialized
+    NVML_VGPU_INSTANCE_GUEST_INFO_STATE_INITIALIZED   = 1   //!< Guest-dependent fields initialized
 } nvmlVgpuGuestInfoState_t;
 
 /**
@@ -925,6 +994,15 @@ typedef enum {
     NVML_GRID_LICENSE_FEATURE_CODE_COMPUTE      = 4                                          //!< Compute
 } nvmlGridLicenseFeatureCode_t;
 
+/**
+ * Status codes for license expiry
+ */
+#define NVML_GRID_LICENSE_EXPIRY_NOT_AVAILABLE   0   //!< Expiry information not available
+#define NVML_GRID_LICENSE_EXPIRY_INVALID         1   //!< Invalid expiry or error fetching expiry
+#define NVML_GRID_LICENSE_EXPIRY_VALID           2   //!< Valid expiry
+#define NVML_GRID_LICENSE_EXPIRY_NOT_APPLICABLE  3   //!< Expiry not applicable
+#define NVML_GRID_LICENSE_EXPIRY_PERMANENT       4   //!< Permanent expiry
+
 /** @} */
 
 /***************************************************************************************************/
@@ -1014,6 +1092,21 @@ typedef struct nvmlProcessUtilizationSample_st
     unsigned int decUtil;               //!< Decoder Util Value
 } nvmlProcessUtilizationSample_t;
 
+/**
+ * Structure to store license expiry date and time values
+ */
+typedef struct nvmlGridLicenseExpiry_st
+{
+    unsigned int   year;        //!< Year value of license expiry
+    unsigned short month;       //!< Month value of license expiry
+    unsigned short day;         //!< Day value of license expiry
+    unsigned short hour;        //!< Hour value of license expiry
+    unsigned short min;         //!< Minutes value of license expiry
+    unsigned short sec;         //!< Seconds value of license expiry
+
+    unsigned char  status;      //!< License expiry status
+} nvmlGridLicenseExpiry_t;
+
 /**
  * Structure containing vGPU software licensable feature information
  */
@@ -1022,8 +1115,9 @@ typedef struct nvmlGridLicensableFeature_st
     nvmlGridLicenseFeatureCode_t    featureCode;                                 //!< Licensed feature code
     unsigned int                    featureState;                                //!< Non-zero if feature is currently licensed, otherwise zero
     char                            licenseInfo[NVML_GRID_LICENSE_BUFFER_SIZE];  //!< Deprecated.
-    char                            productName[NVML_GRID_LICENSE_BUFFER_SIZE];
+    char                            productName[NVML_GRID_LICENSE_BUFFER_SIZE];  //!< Product name of feature
     unsigned int                    featureEnabled;                              //!< Non-zero if feature is enabled, otherwise zero
+    nvmlGridLicenseExpiry_t         licenseExpiry;                               //!< License expiry structure containing date and time
 } nvmlGridLicensableFeature_t;
 
 /**
@@ -1336,47 +1430,47 @@ typedef struct nvmlFieldValue_st
 
 typedef struct nvmlUnit_st* nvmlUnit_t;
 
-/** 
- * Description of HWBC entry 
+/**
+ * Description of HWBC entry
  */
-typedef struct nvmlHwbcEntry_st 
+typedef struct nvmlHwbcEntry_st
 {
     unsigned int hwbcId;
     char firmwareVersion[32];
 } nvmlHwbcEntry_t;
 
-/** 
- * Fan state enum. 
+/**
+ * Fan state enum.
  */
-typedef enum nvmlFanState_enum 
+typedef enum nvmlFanState_enum
 {
     NVML_FAN_NORMAL       = 0,     //!< Fan is working properly
     NVML_FAN_FAILED       = 1      //!< Fan has failed
 } nvmlFanState_t;
 
-/** 
- * Led color enum. 
+/**
+ * Led color enum.
  */
-typedef enum nvmlLedColor_enum 
+typedef enum nvmlLedColor_enum
 {
     NVML_LED_COLOR_GREEN       = 0,     //!< GREEN, indicates good health
     NVML_LED_COLOR_AMBER       = 1      //!< AMBER, indicates problem
 } nvmlLedColor_t;
 
 
-/** 
+/**
  * LED states for an S-class unit.
  */
-typedef struct nvmlLedState_st 
+typedef struct nvmlLedState_st
 {
     char cause[256];               //!< If amber, a text description of the cause
     nvmlLedColor_t color;          //!< GREEN or AMBER
 } nvmlLedState_t;
 
-/** 
+/**
  * Static S-class unit info.
  */
-typedef struct nvmlUnitInfo_st 
+typedef struct nvmlUnitInfo_st
 {
     char name[96];                      //!< Product name
     char id[96];                        //!< Product identifier
@@ -1384,11 +1478,11 @@ typedef struct nvmlUnitInfo_st
     char firmwareVersion[96];           //!< Firmware version
 } nvmlUnitInfo_t;
 
-/** 
+/**
  * Power usage information for an S-class unit.
  * The power supply state is a human readable string that equals "Normal" or contains
  * a combination of "Abnormal" plus one or more of the following:
- *    
+ *
  *    - High voltage
  *    - Fan failure
  *    - Heatsink temperature
@@ -1397,9 +1491,9 @@ typedef struct nvmlUnitInfo_st
  *    - Low-voltage
  *    - SI2C remote off command
  *    - MOD_DISABLE input
- *    - Short pin transition 
+ *    - Short pin transition
 */
-typedef struct nvmlPSUInfo_st 
+typedef struct nvmlPSUInfo_st
 {
     char state[256];                 //!< The power supply state
     unsigned int current;            //!< PSU current (A)
@@ -1407,19 +1501,19 @@ typedef struct nvmlPSUInfo_st
     unsigned int power;              //!< PSU power draw (W)
 } nvmlPSUInfo_t;
 
-/** 
+/**
  * Fan speed reading for a single fan in an S-class unit.
  */
-typedef struct nvmlUnitFanInfo_st 
+typedef struct nvmlUnitFanInfo_st
 {
     unsigned int speed;              //!< Fan speed (RPM)
     nvmlFanState_t state;            //!< Flag that indicates whether fan is working properly
 } nvmlUnitFanInfo_t;
 
-/** 
+/**
  * Fan speed readings for an entire S-class unit.
  */
-typedef struct nvmlUnitFanSpeeds_st 
+typedef struct nvmlUnitFanSpeeds_st
 {
     nvmlUnitFanInfo_t fans[24];      //!< Fan speed data for each fan
     unsigned int count;              //!< Number of fans in unit
@@ -1428,12 +1522,12 @@ typedef struct nvmlUnitFanSpeeds_st
 /** @} */
 
 /***************************************************************************************************/
-/** @addtogroup nvmlEvents 
+/** @addtogroup nvmlEvents
  *  @{
  */
 /***************************************************************************************************/
 
-/** 
+/**
  * Handle to an event set
  */
 typedef struct nvmlEventSet_st* nvmlEventSet_t;
@@ -1443,7 +1537,7 @@ typedef struct nvmlEventSet_st* nvmlEventSet_t;
  * Event Types which user can be notified about.
  * See description of particular functions for details.
  *
- * See \ref nvmlDeviceRegisterEvents and \ref nvmlDeviceGetSupportedEventTypes to check which devices 
+ * See \ref nvmlDeviceRegisterEvents and \ref nvmlDeviceGetSupportedEventTypes to check which devices
  * support each event.
  *
  * Types can be combined with bitwise or operator '|' when passed to \ref nvmlDeviceRegisterEvents
@@ -1498,7 +1592,7 @@ typedef struct nvmlEventSet_st* nvmlEventSet_t;
         )
 /** @} */
 
-/** 
+/**
  * Information about occurred event
  */
 typedef struct nvmlEventData_st
@@ -1535,13 +1629,13 @@ typedef struct nvmlEventData_st
  */
 #define nvmlClocksThrottleReasonApplicationsClocksSetting 0x0000000000000002LL
 
-/** 
- * @deprecated Renamed to \ref nvmlClocksThrottleReasonApplicationsClocksSetting 
+/**
+ * @deprecated Renamed to \ref nvmlClocksThrottleReasonApplicationsClocksSetting
  *             as the name describes the situation more accurately.
  */
-#define nvmlClocksThrottleReasonUserDefinedClocks         nvmlClocksThrottleReasonApplicationsClocksSetting 
+#define nvmlClocksThrottleReasonUserDefinedClocks         nvmlClocksThrottleReasonApplicationsClocksSetting
 
-/** SW Power Scaling algorithm is reducing the clocks below requested clocks 
+/** SW Power Scaling algorithm is reducing the clocks below requested clocks
  *
  * @see nvmlDeviceGetPowerUsage
  * @see nvmlDeviceSetPowerManagementLimit
@@ -1550,7 +1644,7 @@ typedef struct nvmlEventData_st
 #define nvmlClocksThrottleReasonSwPowerCap                0x0000000000000004LL
 
 /** HW Slowdown (reducing the core clocks by a factor of 2 or more) is engaged
- * 
+ *
  * This is an indicator of:
  *   - temperature being too high
  *   - External Power Brake Assertion is triggered (e.g. by the system power supply)
@@ -1585,7 +1679,7 @@ typedef struct nvmlEventData_st
 #define nvmlClocksThrottleReasonSwThermalSlowdown         0x0000000000000020LL
 
 /** HW Thermal Slowdown (reducing the core clocks by a factor of 2 or more) is engaged
- * 
+ *
  * This is an indicator of:
  *   - temperature being too high
  *
@@ -1596,7 +1690,7 @@ typedef struct nvmlEventData_st
 #define nvmlClocksThrottleReasonHwThermalSlowdown         0x0000000000000040LL
 
 /** HW Power Brake Slowdown (reducing the core clocks by a factor of 2 or more) is engaged
- * 
+ *
  * This is an indicator of:
  *   - External Power Brake Assertion being triggered (e.g. by the system power supply)
  *
@@ -1618,7 +1712,7 @@ typedef struct nvmlEventData_st
  * */
 #define nvmlClocksThrottleReasonNone                      0x0000000000000000LL
 
-/** Bit mask representing all supported clocks throttling reasons 
+/** Bit mask representing all supported clocks throttling reasons
  * New reasons might be added to this list in the future
  */
 #define nvmlClocksThrottleReasonAll (nvmlClocksThrottleReasonNone \
@@ -1640,7 +1734,7 @@ typedef struct nvmlEventData_st
  *
  *  Set of APIs designed to provide per process information about usage of GPU.
  *
- *  @note All accounting statistics and accounting mode live in nvidia driver and reset 
+ *  @note All accounting statistics and accounting mode live in nvidia driver and reset
  *        to default (Disabled) when driver unloads.
  *        It is advised to run with persistence mode enabled.
  *
@@ -1656,19 +1750,19 @@ typedef struct nvmlAccountingStats_st {
                                                 //! Utilization stats just like returned by \ref nvmlDeviceGetUtilizationRates but for the life time of a
                                                 //! process (not just the last sample period).
                                                 //! Set to NVML_VALUE_NOT_AVAILABLE if nvmlDeviceGetUtilizationRates is not supported
-    
+
     unsigned int memoryUtilization;             //!< Percent of time over the process's lifetime during which global (device) memory was being read or written.
                                                 //! Set to NVML_VALUE_NOT_AVAILABLE if nvmlDeviceGetUtilizationRates is not supported
-    
+
     unsigned long long maxMemoryUsage;          //!< Maximum total memory in bytes that was ever allocated by the process.
                                                 //! Set to NVML_VALUE_NOT_AVAILABLE if nvmlProcessInfo_t->usedGpuMemory is not supported
-    
 
-    unsigned long long time;                    //!< Amount of time in ms during which the compute context was active. The time is reported as 0 if 
+
+    unsigned long long time;                    //!< Amount of time in ms during which the compute context was active. The time is reported as 0 if
                                                 //!< the process is not terminated
-    
+
     unsigned long long startTime;               //!< CPU Timestamp in usec representing start time for the process
-    
+
     unsigned int isRunning;                     //!< Flag to represent if the process is running (1 for running, 0 for terminated)
 
     unsigned int reserved[5];                   //!< Reserved for future use
@@ -1688,7 +1782,7 @@ typedef struct nvmlAccountingStats_st {
 typedef enum nvmlEncoderQueryType_enum
 {
     NVML_ENCODER_QUERY_H264 = 0,        //!< H264 encoder
-    NVML_ENCODER_QUERY_HEVC = 1,        //!< HEVC encoder
+    NVML_ENCODER_QUERY_HEVC = 1         //!< HEVC encoder
 }nvmlEncoderType_t;
 
 /**
@@ -1723,7 +1817,7 @@ typedef enum nvmlFBCSessionType_enum
     NVML_FBC_SESSION_TYPE_TOSYS,           //!< ToSys
     NVML_FBC_SESSION_TYPE_CUDA,            //!< Cuda
     NVML_FBC_SESSION_TYPE_VID,             //!< Vid
-    NVML_FBC_SESSION_TYPE_HWENC,           //!< HEnc
+    NVML_FBC_SESSION_TYPE_HWENC            //!< HEnc
 } nvmlFBCSessionType_t;
 
 /**
@@ -1775,7 +1869,7 @@ typedef struct nvmlFBCSessionInfo_st
 typedef enum nvmlDetachGpuState_enum
 {
     NVML_DETACH_GPU_KEEP         = 0,
-    NVML_DETACH_GPU_REMOVE,
+    NVML_DETACH_GPU_REMOVE
 } nvmlDetachGpuState_t;
 
 /**
@@ -1784,7 +1878,7 @@ typedef enum nvmlDetachGpuState_enum
 typedef enum nvmlPcieLinkState_enum
 {
     NVML_PCIE_LINK_KEEP         = 0,
-    NVML_PCIE_LINK_SHUT_DOWN,
+    NVML_PCIE_LINK_SHUT_DOWN
 } nvmlPcieLinkState_t;
 
 /** @} */
@@ -1792,7 +1886,7 @@ typedef enum nvmlPcieLinkState_enum
 /***************************************************************************************************/
 /** @defgroup nvmlInitializationAndCleanup Initialization and Cleanup
  * This chapter describes the methods that handle NVML initialization and cleanup.
- * It is the user's responsibility to call \ref nvmlInit_v2() before calling any other methods, and 
+ * It is the user's responsibility to call \ref nvmlInit_v2() before calling any other methods, and
  * nvmlShutdown() once NVML is no longer being used.
  *  @{
  */
@@ -1808,21 +1902,21 @@ typedef enum nvmlPcieLinkState_enum
  *       modifying the behaviour of nvmlInit().
  * \note In NVML 5.319 new nvmlInit_v2 has replaced nvmlInit"_v1" (default in NVML 4.304 and older) that
  *       did initialize all GPU devices in the system.
- *       
+ *
  * This allows NVML to communicate with a GPU
  * when other GPUs in the system are unstable or in a bad state.  When using this API, GPUs are
  * discovered and initialized in nvmlDeviceGetHandleBy* functions instead.
- * 
+ *
  * \note To contrast nvmlInit_v2 with nvmlInit"_v1", NVML 4.304 nvmlInit"_v1" will fail when any detected GPU is in
  *       a bad or unstable state.
- * 
+ *
  * For all products.
  *
  * This method, should be called once before invoking any other methods in the library.
  * A reference count of the number of initializations is maintained.  Shutdown only occurs
  * when the reference count reaches zero.
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                   if NVML has been properly initialized
  *         - \ref NVML_ERROR_DRIVER_NOT_LOADED   if NVIDIA driver is not running
  *         - \ref NVML_ERROR_NO_PERMISSION       if NVML does not have permission to talk to the driver
@@ -1834,12 +1928,12 @@ nvmlReturn_t DECLDIR nvmlInit_v2(void);
  * nvmlInitWithFlags is a variant of nvmlInit(), that allows passing a set of boolean values
  *       modifying the behaviour of nvmlInit().
  *       Other than the "flags" parameter it is completely similar to \ref nvmlInit_v2.
- *       
+ *
  * For all products.
  *
  * @param flags                                 behaviour modifier flags
  *
- * @return 
+ * @return
  *         - \ref NVML_SUCCESS                   if NVML has been properly initialized
  *         - \ref NVML_ERROR_DRIVER_NOT_LOADED   if NVIDIA driver is not running
  *         - \ref NVML_ERROR_NO_PERMISSION       if NVML does not have permission to talk to the driver
@@ -1849,15 +1943,15 @@ nvmlReturn_t DECLDIR nvmlInitWithFlags(unsigned int flags);
 
 /**
  * Shut down NVML by releasing all GPU resources previously allocated with \ref nvmlInit_v2().
- * 
+ *
  * For all products.
  *
  * This method should be called after NVML work is done, once for each call to \ref nvmlInit_v2()
  * A reference count of the number of initializations is maintained.  Shutdown only occurs
  * when the reference count reaches zero.  For backwards compatibility, no error is reported if
  * nvmlShutdown() is called more times than nvmlInit().
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if NVML has been properly shut down
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_UNKNOWN           on any unexpected error
@@ -1955,7 +2049,7 @@ const DECLDIR char* nvmlErrorString(nvmlReturn_t result);
 
 /**
  * Retrieves the version of the system's graphics driver.
- * 
+ *
  * For all products.
  *
  * The version identifier is an alphanumeric string.  It will not exceed 80 characters in length
@@ -1964,17 +2058,17 @@ const DECLDIR char* nvmlErrorString(nvmlReturn_t result);
  * @param version                              Reference in which to return the version identifier
  * @param length                               The maximum allowed length of the string returned in \a version
  *
- * @return 
+ * @return
  *         - \ref NVML_SUCCESS                 if \a version has been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a version is NULL
- *         - \ref NVML_ERROR_INSUFFICIENT_SIZE if \a length is too small 
+ *         - \ref NVML_ERROR_INSUFFICIENT_SIZE if \a length is too small
  */
 nvmlReturn_t DECLDIR nvmlSystemGetDriverVersion(char *version, unsigned int length);
 
 /**
  * Retrieves the version of the NVML library.
- * 
+ *
  * For all products.
  *
  * The version identifier is an alphanumeric string.  It will not exceed 80 characters in length
@@ -1983,10 +2077,10 @@ nvmlReturn_t DECLDIR nvmlSystemGetDriverVersion(char *version, unsigned int leng
  * @param version                              Reference in which to return the version identifier
  * @param length                               The maximum allowed length of the string returned in \a version
  *
- * @return 
+ * @return
  *         - \ref NVML_SUCCESS                 if \a version has been set
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a version is NULL
- *         - \ref NVML_ERROR_INSUFFICIENT_SIZE if \a length is too small 
+ *         - \ref NVML_ERROR_INSUFFICIENT_SIZE if \a length is too small
  */
 nvmlReturn_t DECLDIR nvmlSystemGetNVMLVersion(char *version, unsigned int length);
 
@@ -2040,8 +2134,8 @@ nvmlReturn_t DECLDIR nvmlSystemGetCudaDriverVersion_v2(int *cudaDriverVersion);
  * @param pid                                  The identifier of the process
  * @param name                                 Reference in which to return the process name
  * @param length                               The maximum allowed length of the string returned in \a name
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if \a name has been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a name is NULL or \a length is 0.
@@ -2056,7 +2150,7 @@ nvmlReturn_t DECLDIR nvmlSystemGetProcessName(unsigned int pid, char *name, unsi
 /***************************************************************************************************/
 /** @defgroup nvmlUnitQueries Unit Queries
  * This chapter describes that queries that NVML can perform against each unit. For S-class systems only.
- * In each case the device is identified with an nvmlUnit_t handle. This handle is obtained by 
+ * In each case the device is identified with an nvmlUnit_t handle. This handle is obtained by
  * calling \ref nvmlUnitGetHandleByIndex().
  *  @{
  */
@@ -2068,8 +2162,8 @@ nvmlReturn_t DECLDIR nvmlSystemGetProcessName(unsigned int pid, char *name, unsi
  * For S-class products.
  *
  * @param unitCount                            Reference in which to return the number of units
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if \a unitCount has been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a unitCount is NULL
@@ -2082,15 +2176,15 @@ nvmlReturn_t DECLDIR nvmlUnitGetCount(unsigned int *unitCount);
  *
  * For S-class products.
  *
- * Valid indices are derived from the \a unitCount returned by \ref nvmlUnitGetCount(). 
+ * Valid indices are derived from the \a unitCount returned by \ref nvmlUnitGetCount().
  *   For example, if \a unitCount is 2 the valid indices are 0 and 1, corresponding to UNIT 0 and UNIT 1.
  *
  * The order in which NVML enumerates units has no guarantees of consistency between reboots.
  *
  * @param index                                The index of the target unit, >= 0 and < \a unitCount
  * @param unit                                 Reference in which to return the unit handle
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if \a unit has been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a index is invalid or \a unit is NULL
@@ -2107,8 +2201,8 @@ nvmlReturn_t DECLDIR nvmlUnitGetHandleByIndex(unsigned int index, nvmlUnit_t *un
  *
  * @param unit                                 The identifier of the target unit
  * @param info                                 Reference in which to return the unit information
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if \a info has been populated
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a unit is invalid or \a info is NULL
@@ -2124,14 +2218,14 @@ nvmlReturn_t DECLDIR nvmlUnitGetUnitInfo(nvmlUnit_t unit, nvmlUnitInfo_t *info);
  *
  * @param unit                                 The identifier of the target unit
  * @param state                                Reference in which to return the current LED state
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if \a state has been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a unit is invalid or \a state is NULL
  *         - \ref NVML_ERROR_NOT_SUPPORTED     if this is not an S-class product
  *         - \ref NVML_ERROR_UNKNOWN           on any unexpected error
- * 
+ *
  * @see nvmlUnitSetLedState()
  */
 nvmlReturn_t DECLDIR nvmlUnitGetLedState(nvmlUnit_t unit, nvmlLedState_t *state);
@@ -2145,8 +2239,8 @@ nvmlReturn_t DECLDIR nvmlUnitGetLedState(nvmlUnit_t unit, nvmlLedState_t *state)
  *
  * @param unit                                 The identifier of the target unit
  * @param psu                                  Reference in which to return the PSU information
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if \a psu has been populated
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a unit is invalid or \a psu is NULL
@@ -2160,14 +2254,14 @@ nvmlReturn_t DECLDIR nvmlUnitGetPsuInfo(nvmlUnit_t unit, nvmlPSUInfo_t *psu);
  *
  * For S-class products.
  *
- * Depending on the product, readings may be available for intake (type=0), 
+ * Depending on the product, readings may be available for intake (type=0),
  * exhaust (type=1) and board (type=2).
  *
  * @param unit                                 The identifier of the target unit
  * @param type                                 The type of reading to take
  * @param temp                                 Reference in which to return the intake temperature
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if \a temp has been populated
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a unit or \a type is invalid or \a temp is NULL
@@ -2185,8 +2279,8 @@ nvmlReturn_t DECLDIR nvmlUnitGetTemperature(nvmlUnit_t unit, unsigned int type,
  *
  * @param unit                                 The identifier of the target unit
  * @param fanSpeeds                            Reference in which to return the fan speed information
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if \a fanSpeeds has been populated
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a unit is invalid or \a fanSpeeds is NULL
@@ -2206,8 +2300,8 @@ nvmlReturn_t DECLDIR nvmlUnitGetFanSpeedInfo(nvmlUnit_t unit, nvmlUnitFanSpeeds_
  * @param deviceCount                          Reference in which to provide the \a devices array size, and
  *                                             to return the number of attached GPU devices
  * @param devices                              Reference in which to return the references to the attached GPU devices
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if \a deviceCount and \a devices have been populated
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INSUFFICIENT_SIZE if \a deviceCount indicates that the \a devices array is too small
@@ -2218,7 +2312,7 @@ nvmlReturn_t DECLDIR nvmlUnitGetDevices(nvmlUnit_t unit, unsigned int *deviceCou
 
 /**
  * Retrieves the IDs and firmware versions for any Host Interface Cards (HICs) in the system.
- * 
+ *
  * For S-class products.
  *
  * The \a hwbcCount argument is expected to be set to the size of the input \a hwbcEntries array.
@@ -2227,7 +2321,7 @@ nvmlReturn_t DECLDIR nvmlUnitGetDevices(nvmlUnit_t unit, unsigned int *deviceCou
  * @param hwbcCount                            Size of hwbcEntries array
  * @param hwbcEntries                          Array holding information about hwbc
  *
- * @return 
+ * @return
  *         - \ref NVML_SUCCESS                 if \a hwbcCount and \a hwbcEntries have been populated
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if either \a hwbcCount or \a hwbcEntries is NULL
@@ -2239,16 +2333,16 @@ nvmlReturn_t DECLDIR nvmlSystemGetHicVersion(unsigned int *hwbcCount, nvmlHwbcEn
 /***************************************************************************************************/
 /** @defgroup nvmlDeviceQueries Device Queries
  * This chapter describes that queries that NVML can perform against each device.
- * In each case the device is identified with an nvmlDevice_t handle. This handle is obtained by  
+ * In each case the device is identified with an nvmlDevice_t handle. This handle is obtained by
  * calling one of \ref nvmlDeviceGetHandleByIndex_v2(), \ref nvmlDeviceGetHandleBySerial(),
- * \ref nvmlDeviceGetHandleByPciBusId_v2(). or \ref nvmlDeviceGetHandleByUUID(). 
+ * \ref nvmlDeviceGetHandleByPciBusId_v2(). or \ref nvmlDeviceGetHandleByUUID().
  *  @{
  */
 /***************************************************************************************************/
 
  /**
  * Retrieves the number of compute devices in the system. A compute device is a single GPU.
- * 
+ *
  * For all products.
  *
  * Note: New nvmlDeviceGetCount_v2 (default in NVML 5.319) returns count of all devices in the system
@@ -2259,8 +2353,8 @@ nvmlReturn_t DECLDIR nvmlSystemGetHicVersion(unsigned int *hwbcCount, nvmlHwbcEn
  *       Old _v1 version of nvmlDeviceGetCount doesn't count devices that NVML has no permission to talk to.
  *
  * @param deviceCount                          Reference in which to return the number of accessible devices
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if \a deviceCount has been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a deviceCount is NULL
@@ -2290,15 +2384,15 @@ nvmlReturn_t DECLDIR nvmlDeviceGetAttributes_v2(nvmlDevice_t device, nvmlDeviceA
 
 /**
  * Acquire the handle for a particular device, based on its index.
- * 
+ *
  * For all products.
  *
- * Valid indices are derived from the \a accessibleDevices count returned by 
- *   \ref nvmlDeviceGetCount_v2(). For example, if \a accessibleDevices is 2 the valid indices  
+ * Valid indices are derived from the \a accessibleDevices count returned by
+ *   \ref nvmlDeviceGetCount_v2(). For example, if \a accessibleDevices is 2 the valid indices
  *   are 0 and 1, corresponding to GPU 0 and GPU 1.
  *
  * The order in which NVML enumerates devices has no guarantees of consistency between reboots. For that reason it
- *   is recommended that devices be looked up by their PCI ids or UUID. See 
+ *   is recommended that devices be looked up by their PCI ids or UUID. See
  *   \ref nvmlDeviceGetHandleByUUID() and \ref nvmlDeviceGetHandleByPciBusId_v2().
  *
  * Note: The NVML index may not correlate with other APIs, such as the CUDA device index.
@@ -2306,7 +2400,7 @@ nvmlReturn_t DECLDIR nvmlDeviceGetAttributes_v2(nvmlDevice_t device, nvmlDeviceA
  * Starting from NVML 5, this API causes NVML to initialize the target GPU
  * NVML may initialize additional GPUs if:
  *  - The target GPU is an SLI slave
- * 
+ *
  * Note: New nvmlDeviceGetCount_v2 (default in NVML 5.319) returns count of all devices in the system
  *       even if nvmlDeviceGetHandleByIndex_v2 returns NVML_ERROR_NO_PERMISSION for such device.
  *       Update your code to handle this error, or use NVML 4.304 or older nvml header file.
@@ -2320,8 +2414,8 @@ nvmlReturn_t DECLDIR nvmlDeviceGetAttributes_v2(nvmlDevice_t device, nvmlDeviceA
  *
  * @param index                                The index of the target GPU, >= 0 and < \a accessibleDevices
  * @param device                               Reference in which to return the device handle
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                  if \a device has been set
  *         - \ref NVML_ERROR_UNINITIALIZED      if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT   if \a index is invalid or \a device is NULL
@@ -2344,7 +2438,7 @@ nvmlReturn_t DECLDIR nvmlDeviceGetHandleByIndex_v2(unsigned int index, nvmlDevic
  * This number corresponds to the value printed directly on the board, and to the value returned by
  *   \ref nvmlDeviceGetSerial().
  *
- * @deprecated Since more than one GPU can exist on a single board this function is deprecated in favor 
+ * @deprecated Since more than one GPU can exist on a single board this function is deprecated in favor
  *             of \ref nvmlDeviceGetHandleByUUID.
  *             For dual GPU boards this function will return NVML_ERROR_INVALID_ARGUMENT.
  *
@@ -2353,8 +2447,8 @@ nvmlReturn_t DECLDIR nvmlDeviceGetHandleByIndex_v2(unsigned int index, nvmlDevic
  *
  * @param serial                               The board serial number of the target GPU
  * @param device                               Reference in which to return the device handle
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                  if \a device has been set
  *         - \ref NVML_ERROR_UNINITIALIZED      if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT   if \a serial is invalid, \a device is NULL or more than one
@@ -2375,15 +2469,13 @@ nvmlReturn_t DECLDIR nvmlDeviceGetHandleBySerial(const char *serial, nvmlDevice_
  *
  * For all products.
  *
- * @param uuid                                 The UUID of the target GPU
- * @param device                               Reference in which to return the device handle
- * 
+ * @param uuid                                 The UUID of the target GPU or MIG instance
+ * @param device                               Reference in which to return the device handle or MIG device handle
+ *
  * Starting from NVML 5, this API causes NVML to initialize the target GPU
  * NVML may initialize additional GPUs as it searches for the target GPU
  *
- * This API does not currently support acquiring MIG device handles using MIG device UUIDs.
- *
- * @return 
+ * @return
  *         - \ref NVML_SUCCESS                  if \a device has been set
  *         - \ref NVML_ERROR_UNINITIALIZED      if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT   if \a uuid is invalid or \a device is null
@@ -2399,7 +2491,7 @@ nvmlReturn_t DECLDIR nvmlDeviceGetHandleByUUID(const char *uuid, nvmlDevice_t *d
 
 /**
  * Acquire the handle for a particular device, based on its PCI bus id.
- * 
+ *
  * For all products.
  *
  * This value corresponds to the nvmlPciInfo_t::busId returned by \ref nvmlDeviceGetPciInfo_v3().
@@ -2408,13 +2500,13 @@ nvmlReturn_t DECLDIR nvmlDeviceGetHandleByUUID(const char *uuid, nvmlDevice_t *d
  * NVML may initialize additional GPUs if:
  *  - The target GPU is an SLI slave
  *
- * \note NVML 4.304 and older version of nvmlDeviceGetHandleByPciBusId"_v1" returns NVML_ERROR_NOT_FOUND 
+ * \note NVML 4.304 and older version of nvmlDeviceGetHandleByPciBusId"_v1" returns NVML_ERROR_NOT_FOUND
  *       instead of NVML_ERROR_NO_PERMISSION.
  *
  * @param pciBusId                             The PCI bus id of the target GPU
  * @param device                               Reference in which to return the device handle
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                  if \a device has been set
  *         - \ref NVML_ERROR_UNINITIALIZED      if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT   if \a pciBusId is invalid or \a device is NULL
@@ -2428,8 +2520,8 @@ nvmlReturn_t DECLDIR nvmlDeviceGetHandleByUUID(const char *uuid, nvmlDevice_t *d
 nvmlReturn_t DECLDIR nvmlDeviceGetHandleByPciBusId_v2(const char *pciBusId, nvmlDevice_t *device);
 
 /**
- * Retrieves the name of this device. 
- * 
+ * Retrieves the name of this device.
+ *
  * For all products.
  *
  * The name is an alphanumeric string that denotes a particular product, e.g. Tesla &tm; C2070. It will not
@@ -2442,8 +2534,8 @@ nvmlReturn_t DECLDIR nvmlDeviceGetHandleByPciBusId_v2(const char *pciBusId, nvml
  * @param device                               The identifier of the target device
  * @param name                                 Reference in which to return the product name
  * @param length                               The maximum allowed length of the string returned in \a name
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if \a name has been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid, or \a name is NULL
@@ -2476,13 +2568,13 @@ nvmlReturn_t DECLDIR nvmlDeviceGetBrand(nvmlDevice_t device, nvmlBrandType_t *ty
  * Retrieves the NVML index of this device.
  *
  * For all products.
- * 
- * Valid indices are derived from the \a accessibleDevices count returned by 
- *   \ref nvmlDeviceGetCount_v2(). For example, if \a accessibleDevices is 2 the valid indices  
+ *
+ * Valid indices are derived from the \a accessibleDevices count returned by
+ *   \ref nvmlDeviceGetCount_v2(). For example, if \a accessibleDevices is 2 the valid indices
  *   are 0 and 1, corresponding to GPU 0 and GPU 1.
  *
  * The order in which NVML enumerates devices has no guarantees of consistency between reboots. For that reason it
- *   is recommended that devices be looked up by their PCI ids or GPU UUID. See 
+ *   is recommended that devices be looked up by their PCI ids or GPU UUID. See
  *   \ref nvmlDeviceGetHandleByPciBusId_v2() and \ref nvmlDeviceGetHandleByUUID().
  *
  * When used with MIG device handles this API returns indices that can be
@@ -2494,7 +2586,7 @@ nvmlReturn_t DECLDIR nvmlDeviceGetBrand(nvmlDevice_t device, nvmlBrandType_t *ty
  * @param device                               The identifier of the target device
  * @param index                                Reference in which to return the NVML index of the device
  *
- * @return 
+ * @return
  *         - \ref NVML_SUCCESS                 if \a index has been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid, or \a index is NULL
@@ -2518,8 +2610,8 @@ nvmlReturn_t DECLDIR nvmlDeviceGetIndex(nvmlDevice_t device, unsigned int *index
  * @param device                               The identifier of the target device
  * @param serial                               Reference in which to return the board/module serial number
  * @param length                               The maximum allowed length of the string returned in \a serial
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if \a serial has been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid, or \a serial is NULL
@@ -2592,11 +2684,11 @@ nvmlReturn_t DECLDIR nvmlDeviceGetMemoryAffinity(nvmlDevice_t device, unsigned i
  *
  * @param device                               The identifier of the target device
  * @param cpuSetSize                           The size of the cpuSet array that is safe to access
- * @param cpuSet                               Array reference in which to return a bitmask of CPUs, 64 CPUs per 
+ * @param cpuSet                               Array reference in which to return a bitmask of CPUs, 64 CPUs per
  *                                                 unsigned long on 64-bit machines, 32 on 32-bit machines
  * @param scope                                Scope that change the default behavior
  *
- * @return 
+ * @return
  *         - \ref NVML_SUCCESS                 if \a cpuAffinity has been filled
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid, cpuSetSize == 0, cpuSet is NULL or sope is invalid
@@ -2618,10 +2710,10 @@ nvmlReturn_t DECLDIR nvmlDeviceGetCpuAffinityWithinScope(nvmlDevice_t device, un
  *
  * @param device                               The identifier of the target device
  * @param cpuSetSize                           The size of the cpuSet array that is safe to access
- * @param cpuSet                               Array reference in which to return a bitmask of CPUs, 64 CPUs per 
+ * @param cpuSet                               Array reference in which to return a bitmask of CPUs, 64 CPUs per
  *                                                 unsigned long on 64-bit machines, 32 on 32-bit machines
  *
- * @return 
+ * @return
  *         - \ref NVML_SUCCESS                 if \a cpuAffinity has been filled
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid, cpuSetSize == 0, or cpuSet is NULL
@@ -2632,8 +2724,8 @@ nvmlReturn_t DECLDIR nvmlDeviceGetCpuAffinityWithinScope(nvmlDevice_t device, un
 nvmlReturn_t DECLDIR nvmlDeviceGetCpuAffinity(nvmlDevice_t device, unsigned int cpuSetSize, unsigned long *cpuSet);
 
 /**
- * Sets the ideal affinity for the calling thread and device using the guidelines 
- * given in nvmlDeviceGetCpuAffinity().  Note, this is a change as of version 8.0.  
+ * Sets the ideal affinity for the calling thread and device using the guidelines
+ * given in nvmlDeviceGetCpuAffinity().  Note, this is a change as of version 8.0.
  * Older versions set the affinity for a calling process and all children.
  * Currently supports up to 1024 processors.
  *
@@ -2642,7 +2734,7 @@ nvmlReturn_t DECLDIR nvmlDeviceGetCpuAffinity(nvmlDevice_t device, unsigned int
  *
  * @param device                               The identifier of the target device
  *
- * @return 
+ * @return
  *         - \ref NVML_SUCCESS                 if the calling process has been successfully bound
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid
@@ -2661,7 +2753,7 @@ nvmlReturn_t DECLDIR nvmlDeviceSetCpuAffinity(nvmlDevice_t device);
  *
  * @param device                               The identifier of the target device
  *
- * @return 
+ * @return
  *         - \ref NVML_SUCCESS                 if the calling process has been successfully unbound
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
@@ -2695,7 +2787,7 @@ nvmlReturn_t DECLDIR nvmlDeviceGetTopologyCommonAncestor(nvmlDevice_t device1, n
  *
  * @param device                               The identifier of the first device
  * @param level                                The \ref nvmlGpuTopologyLevel_t level to search for other GPUs
- * @param count                                When zero, is set to the number of matching GPUs such that \a deviceArray 
+ * @param count                                When zero, is set to the number of matching GPUs such that \a deviceArray
  *                                             can be malloc'd.  When non-zero, \a deviceArray will be filled with \a count
  *                                             number of device handles.
  * @param deviceArray                          An array of device handles for GPUs found at \a level
@@ -2714,7 +2806,7 @@ nvmlReturn_t DECLDIR nvmlDeviceGetTopologyNearestGpus(nvmlDevice_t device, nvmlG
  * Supported on Linux only.
  *
  * @param cpuNumber                            The CPU number
- * @param count                                When zero, is set to the number of matching GPUs such that \a deviceArray 
+ * @param count                                When zero, is set to the number of matching GPUs such that \a deviceArray
  *                                             can be malloc'd.  When non-zero, \a deviceArray will be filled with \a count
  *                                             number of device handles.
  * @param deviceArray                          An array of device handles for GPUs found with affinity to \a cpuNumber
@@ -2728,18 +2820,18 @@ nvmlReturn_t DECLDIR nvmlDeviceGetTopologyNearestGpus(nvmlDevice_t device, nvmlG
 nvmlReturn_t DECLDIR nvmlSystemGetTopologyGpuSet(unsigned int cpuNumber, unsigned int *count, nvmlDevice_t *deviceArray);
 
 /**
- * Retrieve the status for a given p2p capability index between a given pair of GPU 
- * 
- * @param device1                              The first device 
+ * Retrieve the status for a given p2p capability index between a given pair of GPU
+ *
+ * @param device1                              The first device
  * @param device2                              The second device
  * @param p2pIndex                             p2p Capability Index being looked for between \a device1 and \a device2
  * @param p2pStatus                            Reference in which to return the status of the \a p2pIndex
  *                                             between \a device1 and \a device2
- * @return 
+ * @return
  *         - \ref NVML_SUCCESS         if \a p2pStatus has been populated
  *         - \ref NVML_ERROR_INVALID_ARGUMENT     if \a device1 or \a device2 or \a p2pIndex is invalid or \a p2pStatus is NULL
  *         - \ref NVML_ERROR_UNKNOWN              on any unexpected error
- */ 
+ */
 nvmlReturn_t DECLDIR nvmlDeviceGetP2PStatus(nvmlDevice_t device1, nvmlDevice_t device2, nvmlGpuP2PCapsIndex_t p2pIndex,nvmlGpuP2PStatus_t *p2pStatus);
 
 /**
@@ -2758,12 +2850,12 @@ nvmlReturn_t DECLDIR nvmlDeviceGetP2PStatus(nvmlDevice_t device1, nvmlDevice_t d
  * @param device                               The identifier of the target device
  * @param uuid                                 Reference in which to return the GPU UUID
  * @param length                               The maximum allowed length of the string returned in \a uuid
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if \a uuid has been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid, or \a uuid is NULL
- *         - \ref NVML_ERROR_INSUFFICIENT_SIZE if \a length is too small 
+ *         - \ref NVML_ERROR_INSUFFICIENT_SIZE if \a length is too small
  *         - \ref NVML_ERROR_NOT_SUPPORTED     if the device does not support this feature
  *         - \ref NVML_ERROR_GPU_IS_LOST       if the target GPU has fallen off the bus or is otherwise inaccessible
  *         - \ref NVML_ERROR_UNKNOWN           on any unexpected error
@@ -2796,7 +2888,7 @@ nvmlReturn_t DECLDIR nvmlDeviceGetUUID(nvmlDevice_t device, char *uuid, unsigned
 nvmlReturn_t DECLDIR nvmlVgpuInstanceGetMdevUUID(nvmlVgpuInstance_t vgpuInstance, char *mdevUuid, unsigned int size);
 
 /**
- * Retrieves minor number for the device. The minor number for the device is such that the Nvidia device node file for 
+ * Retrieves minor number for the device. The minor number for the device is such that the Nvidia device node file for
  * each GPU will have the form /dev/nvidia[minor number].
  *
  * For all products.
@@ -2838,7 +2930,7 @@ nvmlReturn_t DECLDIR nvmlDeviceGetBoardPartNumber(nvmlDevice_t device, char* par
  *
  * For all products with an inforom.
  *
- * Fermi and higher parts have non-volatile on-board memory for persisting device info, such as aggregate 
+ * Fermi and higher parts have non-volatile on-board memory for persisting device info, such as aggregate
  * ECC counts. The version of the data structures in this memory may change from time to time. It will not
  * exceed 16 characters in length (including the NULL terminator).
  * See \ref nvmlConstants::NVML_DEVICE_INFOROM_VERSION_BUFFER_SIZE.
@@ -2850,11 +2942,11 @@ nvmlReturn_t DECLDIR nvmlDeviceGetBoardPartNumber(nvmlDevice_t device, char* par
  * @param version                              Reference in which to return the infoROM version
  * @param length                               The maximum allowed length of the string returned in \a version
  *
- * @return 
+ * @return
  *         - \ref NVML_SUCCESS                 if \a version has been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a version is NULL
- *         - \ref NVML_ERROR_INSUFFICIENT_SIZE if \a length is too small 
+ *         - \ref NVML_ERROR_INSUFFICIENT_SIZE if \a length is too small
  *         - \ref NVML_ERROR_NOT_SUPPORTED     if the device does not have an infoROM
  *         - \ref NVML_ERROR_GPU_IS_LOST       if the target GPU has fallen off the bus or is otherwise inaccessible
  *         - \ref NVML_ERROR_UNKNOWN           on any unexpected error
@@ -2868,7 +2960,7 @@ nvmlReturn_t DECLDIR nvmlDeviceGetInforomVersion(nvmlDevice_t device, nvmlInforo
  *
  * For all products with an inforom.
  *
- * Image version just like VBIOS version uniquely describes the exact version of the infoROM flashed on the board 
+ * Image version just like VBIOS version uniquely describes the exact version of the infoROM flashed on the board
  * in contrast to infoROM object version which is only an indicator of supported features.
  * Version string will not exceed 16 characters in length (including the NULL terminator).
  * See \ref nvmlConstants::NVML_DEVICE_INFOROM_VERSION_BUFFER_SIZE.
@@ -2877,11 +2969,11 @@ nvmlReturn_t DECLDIR nvmlDeviceGetInforomVersion(nvmlDevice_t device, nvmlInforo
  * @param version                              Reference in which to return the infoROM image version
  * @param length                               The maximum allowed length of the string returned in \a version
  *
- * @return 
+ * @return
  *         - \ref NVML_SUCCESS                 if \a version has been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a version is NULL
- *         - \ref NVML_ERROR_INSUFFICIENT_SIZE if \a length is too small 
+ *         - \ref NVML_ERROR_INSUFFICIENT_SIZE if \a length is too small
  *         - \ref NVML_ERROR_NOT_SUPPORTED     if the device does not have an infoROM
  *         - \ref NVML_ERROR_GPU_IS_LOST       if the target GPU has fallen off the bus or is otherwise inaccessible
  *         - \ref NVML_ERROR_UNKNOWN           on any unexpected error
@@ -2902,14 +2994,14 @@ nvmlReturn_t DECLDIR nvmlDeviceGetInforomImageVersion(nvmlDevice_t device, char
  * @param device                               The identifier of the target device
  * @param checksum                             Reference in which to return the infoROM configuration checksum
  *
- * @return 
+ * @return
  *         - \ref NVML_SUCCESS                 if \a checksum has been set
  *         - \ref NVML_ERROR_CORRUPTED_INFOROM if the device's checksum couldn't be retrieved due to infoROM corruption
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a checksum is NULL
  *         - \ref NVML_ERROR_NOT_SUPPORTED     if the device does not support this feature
  *         - \ref NVML_ERROR_GPU_IS_LOST       if the target GPU has fallen off the bus or is otherwise inaccessible
- *         - \ref NVML_ERROR_UNKNOWN           on any unexpected error 
+ *         - \ref NVML_ERROR_UNKNOWN           on any unexpected error
  */
 nvmlReturn_t DECLDIR nvmlDeviceGetInforomConfigurationChecksum(nvmlDevice_t device, unsigned int *checksum);
 
@@ -2920,13 +3012,13 @@ nvmlReturn_t DECLDIR nvmlDeviceGetInforomConfigurationChecksum(nvmlDevice_t devi
  *
  * @param device                               The identifier of the target device
  *
- * @return 
+ * @return
  *         - \ref NVML_SUCCESS                 if infoROM is not corrupted
  *         - \ref NVML_ERROR_CORRUPTED_INFOROM if the device's infoROM is corrupted
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_NOT_SUPPORTED     if the device does not support this feature
  *         - \ref NVML_ERROR_GPU_IS_LOST       if the target GPU has fallen off the bus or is otherwise inaccessible
- *         - \ref NVML_ERROR_UNKNOWN           on any unexpected error 
+ *         - \ref NVML_ERROR_UNKNOWN           on any unexpected error
  */
 nvmlReturn_t DECLDIR nvmlDeviceValidateInforom(nvmlDevice_t device);
 
@@ -2942,8 +3034,8 @@ nvmlReturn_t DECLDIR nvmlDeviceValidateInforom(nvmlDevice_t device);
  *
  * @param device                               The identifier of the target device
  * @param display                              Reference in which to return the display mode
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if \a display has been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid or \a display is NULL
@@ -2967,8 +3059,8 @@ nvmlReturn_t DECLDIR nvmlDeviceGetDisplayMode(nvmlDevice_t device, nvmlEnableSta
  *
  * @param device                               The identifier of the target device
  * @param isActive                             Reference in which to return the display active state
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if \a isActive has been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid or \a isActive is NULL
@@ -2984,15 +3076,15 @@ nvmlReturn_t DECLDIR nvmlDeviceGetDisplayActive(nvmlDevice_t device, nvmlEnableS
  * For all products.
  * For Linux only.
  *
- * When driver persistence mode is enabled the driver software state is not torn down when the last 
- * client disconnects. By default this feature is disabled. 
+ * When driver persistence mode is enabled the driver software state is not torn down when the last
+ * client disconnects. By default this feature is disabled.
  *
  * See \ref nvmlEnableState_t for details on allowed modes.
  *
  * @param device                               The identifier of the target device
  * @param mode                                 Reference in which to return the current driver persistence mode
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if \a mode has been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid or \a mode is NULL
@@ -3006,15 +3098,15 @@ nvmlReturn_t DECLDIR nvmlDeviceGetPersistenceMode(nvmlDevice_t device, nvmlEnabl
 
 /**
  * Retrieves the PCI attributes of this device.
- * 
+ *
  * For all products.
  *
  * See \ref nvmlPciInfo_t for details on the available PCI info.
  *
  * @param device                               The identifier of the target device
  * @param pci                                  Reference in which to return the PCI info
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if \a pci has been populated
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid or \a pci is NULL
@@ -3028,13 +3120,13 @@ nvmlReturn_t DECLDIR nvmlDeviceGetPciInfo_v3(nvmlDevice_t device, nvmlPciInfo_t
  *
  * I.E. for a generation 2 PCIe device attached to a generation 1 PCIe bus the max link generation this function will
  * report is generation 1.
- * 
+ *
  * For Fermi &tm; or newer fully supported devices.
- * 
+ *
  * @param device                               The identifier of the target device
  * @param maxLinkGen                           Reference in which to return the max PCIe link generation
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if \a maxLinkGen has been populated
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid or \a maxLinkGen is null
@@ -3049,13 +3141,13 @@ nvmlReturn_t DECLDIR nvmlDeviceGetMaxPcieLinkGeneration(nvmlDevice_t device, uns
  *
  * I.E. for a device with a 16x PCIe bus width attached to a 8x PCIe system bus this function will report
  * a max link width of 8.
- * 
+ *
  * For Fermi &tm; or newer fully supported devices.
- * 
+ *
  * @param device                               The identifier of the target device
  * @param maxLinkWidth                         Reference in which to return the max PCIe link generation
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if \a maxLinkWidth has been populated
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid or \a maxLinkWidth is null
@@ -3067,13 +3159,13 @@ nvmlReturn_t DECLDIR nvmlDeviceGetMaxPcieLinkWidth(nvmlDevice_t device, unsigned
 
 /**
  * Retrieves the current PCIe link generation
- * 
+ *
  * For Fermi &tm; or newer fully supported devices.
- * 
+ *
  * @param device                               The identifier of the target device
  * @param currLinkGen                          Reference in which to return the current PCIe link generation
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if \a currLinkGen has been populated
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid or \a currLinkGen is null
@@ -3085,13 +3177,13 @@ nvmlReturn_t DECLDIR nvmlDeviceGetCurrPcieLinkGeneration(nvmlDevice_t device, un
 
 /**
  * Retrieves the current PCIe link width
- * 
+ *
  * For Fermi &tm; or newer fully supported devices.
- * 
+ *
  * @param device                               The identifier of the target device
  * @param currLinkWidth                        Reference in which to return the current PCIe link generation
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if \a currLinkWidth has been populated
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid or \a currLinkWidth is null
@@ -3103,7 +3195,7 @@ nvmlReturn_t DECLDIR nvmlDeviceGetCurrPcieLinkWidth(nvmlDevice_t device, unsigne
 
 /**
  * Retrieve PCIe utilization information.
- * This function is querying a byte counter over a 20ms interval and thus is the 
+ * This function is querying a byte counter over a 20ms interval and thus is the
  *   PCIe throughput over that interval.
  *
  * For Maxwell &tm; or newer fully supported devices.
@@ -3124,7 +3216,7 @@ nvmlReturn_t DECLDIR nvmlDeviceGetCurrPcieLinkWidth(nvmlDevice_t device, unsigne
  */
 nvmlReturn_t DECLDIR nvmlDeviceGetPcieThroughput(nvmlDevice_t device, nvmlPcieUtilCounter_t counter, unsigned int *value);
 
-/**  
+/**
  * Retrieve the PCIe replay counter.
  *
  * For Kepler &tm; or newer fully supported devices.
@@ -3152,8 +3244,8 @@ nvmlReturn_t DECLDIR nvmlDeviceGetPcieReplayCounter(nvmlDevice_t device, unsigne
  * @param device                               The identifier of the target device
  * @param type                                 Identify which clock domain to query
  * @param clock                                Reference in which to return the clock speed in MHz
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if \a clock has been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid or \a clock is NULL
@@ -3176,8 +3268,8 @@ nvmlReturn_t DECLDIR nvmlDeviceGetClockInfo(nvmlDevice_t device, nvmlClockType_t
  * @param device                               The identifier of the target device
  * @param type                                 Identify which clock domain to query
  * @param clock                                Reference in which to return the clock speed in MHz
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if \a clock has been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid or \a clock is NULL
@@ -3196,8 +3288,8 @@ nvmlReturn_t DECLDIR nvmlDeviceGetMaxClockInfo(nvmlDevice_t device, nvmlClockTyp
  * @param device                               The identifier of the target device
  * @param clockType                            Identify which clock domain to query
  * @param clockMHz                             Reference in which to return the clock in MHz
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if \a clockMHz has been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid or \a clockMHz is NULL or \a clockType is invalid
@@ -3208,7 +3300,7 @@ nvmlReturn_t DECLDIR nvmlDeviceGetMaxClockInfo(nvmlDevice_t device, nvmlClockTyp
 nvmlReturn_t DECLDIR nvmlDeviceGetApplicationsClock(nvmlDevice_t device, nvmlClockType_t clockType, unsigned int *clockMHz);
 
 /**
- * Retrieves the default applications clock that GPU boots with or 
+ * Retrieves the default applications clock that GPU boots with or
  * defaults to after \ref nvmlDeviceResetApplicationsClocks call.
  *
  * For Kepler &tm; or newer fully supported devices.
@@ -3216,8 +3308,8 @@ nvmlReturn_t DECLDIR nvmlDeviceGetApplicationsClock(nvmlDevice_t device, nvmlClo
  * @param device                               The identifier of the target device
  * @param clockType                            Identify which clock domain to query
  * @param clockMHz                             Reference in which to return the default clock in MHz
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if \a clockMHz has been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid or \a clockMHz is NULL or \a clockType is invalid
@@ -3245,8 +3337,8 @@ nvmlReturn_t DECLDIR nvmlDeviceGetDefaultApplicationsClock(nvmlDevice_t device,
  * For Fermi &tm; or newer non-GeForce fully supported devices and Maxwell or newer GeForce devices.
  *
  * @param device                               The identifier of the target device
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if new settings were successfully set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid
@@ -3304,9 +3396,9 @@ nvmlReturn_t DECLDIR nvmlDeviceGetMaxCustomerBoostClock(nvmlDevice_t device, nvm
  * @param count                                Reference in which to provide the \a clocksMHz array size, and
  *                                             to return the number of elements
  * @param clocksMHz                            Reference in which to return the clock in MHz
- * 
- * @return 
- *         - \ref NVML_SUCCESS                 if \a count and \a clocksMHz have been populated 
+ *
+ * @return
+ *         - \ref NVML_SUCCESS                 if \a count and \a clocksMHz have been populated
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid or \a count is NULL
  *         - \ref NVML_ERROR_NOT_SUPPORTED     if the device does not support this feature
@@ -3330,14 +3422,14 @@ nvmlReturn_t DECLDIR nvmlDeviceGetSupportedMemoryClocks(nvmlDevice_t device, uns
  * @param count                                Reference in which to provide the \a clocksMHz array size, and
  *                                             to return the number of elements
  * @param clocksMHz                            Reference in which to return the clocks in MHz
- * 
- * @return 
- *         - \ref NVML_SUCCESS                 if \a count and \a clocksMHz have been populated 
+ *
+ * @return
+ *         - \ref NVML_SUCCESS                 if \a count and \a clocksMHz have been populated
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_NOT_FOUND         if the specified \a memoryClockMHz is not a supported frequency
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid or \a clock is NULL
  *         - \ref NVML_ERROR_NOT_SUPPORTED     if the device does not support this feature
- *         - \ref NVML_ERROR_INSUFFICIENT_SIZE if \a count is too small 
+ *         - \ref NVML_ERROR_INSUFFICIENT_SIZE if \a count is too small
  *         - \ref NVML_ERROR_GPU_IS_LOST       if the target GPU has fallen off the bus or is otherwise inaccessible
  *         - \ref NVML_ERROR_UNKNOWN           on any unexpected error
  *
@@ -3442,7 +3534,7 @@ nvmlReturn_t DECLDIR nvmlDeviceSetDefaultAutoBoostedClocksEnabled(nvmlDevice_t d
  *
  * Note: The reported speed is the intended fan speed.  If the fan is physically blocked and unable to spin, the
  * output will not match the actual fan speed.
- * 
+ *
  * For all discrete products with dedicated fans.
  *
  * The fan speed is expressed as a percentage of the product's maximum noise tolerance fan speed.
@@ -3450,8 +3542,8 @@ nvmlReturn_t DECLDIR nvmlDeviceSetDefaultAutoBoostedClocksEnabled(nvmlDevice_t d
  *
  * @param device                               The identifier of the target device
  * @param speed                                Reference in which to return the fan speed percentage
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if \a speed has been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid or \a speed is NULL
@@ -3489,8 +3581,8 @@ nvmlReturn_t DECLDIR nvmlDeviceGetFanSpeed_v2(nvmlDevice_t device, unsigned int
 
 
 /**
- * Retrieves the current temperature readings for the device, in degrees C. 
- * 
+ * Retrieves the current temperature readings for the device, in degrees C.
+ *
  * For all products.
  *
  * See \ref nvmlTemperatureSensors_t for details on available temperature sensors.
@@ -3498,8 +3590,8 @@ nvmlReturn_t DECLDIR nvmlDeviceGetFanSpeed_v2(nvmlDevice_t device, unsigned int
  * @param device                               The identifier of the target device
  * @param sensorType                           Flag that indicates which sensor reading to retrieve
  * @param temp                                 Reference in which to return the temperature reading
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if \a temp has been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid, \a sensorType is invalid or \a temp is NULL
@@ -3550,7 +3642,7 @@ nvmlReturn_t DECLDIR nvmlDeviceGetTemperatureThreshold(nvmlDevice_t device, nvml
 nvmlReturn_t DECLDIR nvmlDeviceSetTemperatureThreshold(nvmlDevice_t device, nvmlTemperatureThresholds_t thresholdType, int *temp);
 
 /**
- * Retrieves the current performance state for the device. 
+ * Retrieves the current performance state for the device.
  *
  * For Fermi &tm; or newer fully supported devices.
  *
@@ -3558,8 +3650,8 @@ nvmlReturn_t DECLDIR nvmlDeviceSetTemperatureThreshold(nvmlDevice_t device, nvml
  *
  * @param device                               The identifier of the target device
  * @param pState                               Reference in which to return the performance state reading
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if \a pState has been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid or \a pState is NULL
@@ -3580,7 +3672,7 @@ nvmlReturn_t DECLDIR nvmlDeviceGetPerformanceState(nvmlDevice_t device, nvmlPsta
  * @param clocksThrottleReasons                 Reference in which to return bitmask of active clocks throttle
  *                                                  reasons
  *
- * @return 
+ * @return
  *         - \ref NVML_SUCCESS                 if \a clocksThrottleReasons has been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid or \a clocksThrottleReasons is NULL
@@ -3594,7 +3686,7 @@ nvmlReturn_t DECLDIR nvmlDeviceGetPerformanceState(nvmlDevice_t device, nvmlPsta
 nvmlReturn_t DECLDIR nvmlDeviceGetCurrentClocksThrottleReasons(nvmlDevice_t device, unsigned long long *clocksThrottleReasons);
 
 /**
- * Retrieves bitmask of supported clocks throttle reasons that can be returned by 
+ * Retrieves bitmask of supported clocks throttle reasons that can be returned by
  * \ref nvmlDeviceGetCurrentClocksThrottleReasons
  *
  * For all fully supported products.
@@ -3605,7 +3697,7 @@ nvmlReturn_t DECLDIR nvmlDeviceGetCurrentClocksThrottleReasons(nvmlDevice_t devi
  * @param supportedClocksThrottleReasons       Reference in which to return bitmask of supported
  *                                              clocks throttle reasons
  *
- * @return 
+ * @return
  *         - \ref NVML_SUCCESS                 if \a supportedClocksThrottleReasons has been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid or \a supportedClocksThrottleReasons is NULL
@@ -3620,7 +3712,7 @@ nvmlReturn_t DECLDIR nvmlDeviceGetSupportedClocksThrottleReasons(nvmlDevice_t de
 /**
  * Deprecated: Use \ref nvmlDeviceGetPerformanceState. This function exposes an incorrect generalization.
  *
- * Retrieve the current performance state for the device. 
+ * Retrieve the current performance state for the device.
  *
  * For Fermi &tm; or newer fully supported devices.
  *
@@ -3628,8 +3720,8 @@ nvmlReturn_t DECLDIR nvmlDeviceGetSupportedClocksThrottleReasons(nvmlDevice_t de
  *
  * @param device                               The identifier of the target device
  * @param pState                               Reference in which to return the performance state reading
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if \a pState has been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid or \a pState is NULL
@@ -3650,16 +3742,16 @@ nvmlReturn_t DECLDIR nvmlDeviceGetPowerState(nvmlDevice_t device, nvmlPstates_t
  * For from the Kepler or newer families.
  *     - Does not require \a NVML_INFOROM_POWER object.
  *
- * This flag indicates whether any power management algorithm is currently active on the device. An 
- * enabled state does not necessarily mean the device is being actively throttled -- only that 
+ * This flag indicates whether any power management algorithm is currently active on the device. An
+ * enabled state does not necessarily mean the device is being actively throttled -- only that
  * that the driver will do so if the appropriate conditions are met.
  *
  * See \ref nvmlEnableState_t for details on allowed modes.
  *
  * @param device                               The identifier of the target device
  * @param mode                                 Reference in which to return the current power management mode
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if \a mode has been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid or \a mode is NULL
@@ -3677,13 +3769,13 @@ nvmlReturn_t DECLDIR nvmlDeviceGetPowerManagementMode(nvmlDevice_t device, nvmlE
  * The power limit defines the upper boundary for the card's power draw. If
  * the card's total power draw reaches this limit the power management algorithm kicks in.
  *
- * This reading is only available if power management mode is supported. 
+ * This reading is only available if power management mode is supported.
  * See \ref nvmlDeviceGetPowerManagementMode.
  *
  * @param device                               The identifier of the target device
  * @param limit                                Reference in which to return the power management limit in milliwatts
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if \a limit has been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid or \a limit is NULL
@@ -3701,8 +3793,8 @@ nvmlReturn_t DECLDIR nvmlDeviceGetPowerManagementLimit(nvmlDevice_t device, unsi
  * @param device                               The identifier of the target device
  * @param minLimit                             Reference in which to return the minimum power management limit in milliwatts
  * @param maxLimit                             Reference in which to return the maximum power management limit in milliwatts
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if \a minLimit and \a maxLimit have been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid or \a minLimit or \a maxLimit is NULL
@@ -3722,8 +3814,8 @@ nvmlReturn_t DECLDIR nvmlDeviceGetPowerManagementLimitConstraints(nvmlDevice_t d
  *
  * @param device                               The identifier of the target device
  * @param defaultLimit                         Reference in which to return the default power management limit in milliwatts
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if \a defaultLimit has been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid or \a defaultLimit is NULL
@@ -3744,8 +3836,8 @@ nvmlReturn_t DECLDIR nvmlDeviceGetPowerManagementDefaultLimit(nvmlDevice_t devic
  *
  * @param device                               The identifier of the target device
  * @param power                                Reference in which to return the power usage information
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if \a power has been populated
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid or \a power is NULL
@@ -3784,7 +3876,7 @@ nvmlReturn_t DECLDIR nvmlDeviceGetTotalEnergyConsumption(nvmlDevice_t device, un
  * @param device                           The device to communicate with
  * @param limit                            Reference in which to return the power management limit in milliwatts
  *
- * @return 
+ * @return
  *         - \ref NVML_SUCCESS                 if \a limit has been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid or \a limit is NULL
@@ -3804,8 +3896,8 @@ nvmlReturn_t DECLDIR nvmlDeviceGetEnforcedPowerLimit(nvmlDevice_t device, unsign
  * @param device                               The identifier of the target device
  * @param current                              Reference in which to return the current GOM
  * @param pending                              Reference in which to return the pending GOM
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if \a mode has been populated
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid or \a current or \a pending is NULL
@@ -3820,13 +3912,13 @@ nvmlReturn_t DECLDIR nvmlDeviceGetGpuOperationMode(nvmlDevice_t device, nvmlGpuO
 
 /**
  * Retrieves the amount of used, free and total memory available on the device, in bytes.
- * 
+ *
  * For all products.
  *
  * Enabling ECC reduces the amount of total available memory, due to the extra required parity bits.
  * Under WDDM most device memory is allocated and managed on startup by Windows.
  *
- * Under Linux and Windows TCC, the reported amount of used memory is equal to the sum of memory allocated 
+ * Under Linux and Windows TCC, the reported amount of used memory is equal to the sum of memory allocated
  * by all active channels on the device.
  *
  * See \ref nvmlMemory_t for details on available memory info.
@@ -3837,8 +3929,8 @@ nvmlReturn_t DECLDIR nvmlDeviceGetGpuOperationMode(nvmlDevice_t device, nvmlGpuO
  *
  * @param device                               The identifier of the target device
  * @param memory                               Reference in which to return the memory information
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if \a memory has been populated
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_NO_PERMISSION     if the user doesn't have permission to perform this operation
@@ -3857,8 +3949,8 @@ nvmlReturn_t DECLDIR nvmlDeviceGetMemoryInfo(nvmlDevice_t device, nvmlMemory_t *
  *
  * @param device                               The identifier of the target device
  * @param mode                                 Reference in which to return the current compute mode
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if \a mode has been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid or \a mode is NULL
@@ -3909,8 +4001,8 @@ nvmlReturn_t DECLDIR nvmlDeviceGetCudaComputeCapability(nvmlDevice_t device, int
  * @param device                               The identifier of the target device
  * @param current                              Reference in which to return the current ECC mode
  * @param pending                              Reference in which to return the pending ECC mode
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if \a current and \a pending have been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid or either \a current or \a pending is NULL
@@ -3924,13 +4016,13 @@ nvmlReturn_t DECLDIR nvmlDeviceGetEccMode(nvmlDevice_t device, nvmlEnableState_t
 
 /**
  * Retrieves the device boardId from 0-N.
- * Devices with the same boardId indicate GPUs connected to the same PLX.  Use in conjunction with 
+ * Devices with the same boardId indicate GPUs connected to the same PLX.  Use in conjunction with
  *  \ref nvmlDeviceGetMultiGpuBoard() to decide if they are on the same board as well.
- *  The boardId returned is a unique ID for the current configuration.  Uniqueness and ordering across 
+ *  The boardId returned is a unique ID for the current configuration.  Uniqueness and ordering across
  *  reboots and system configurations is not guaranteed (i.e. if a Tesla K40c returns 0x100 and
- *  the two GPUs on a Tesla K10 in the same system returns 0x200 it is not guaranteed they will 
+ *  the two GPUs on a Tesla K10 in the same system returns 0x200 it is not guaranteed they will
  *  always return those values but they will always be different from each other).
- *  
+ *
  *
  * For Fermi &tm; or newer fully supported devices.
  *
@@ -3975,18 +4067,18 @@ nvmlReturn_t DECLDIR nvmlDeviceGetMultiGpuBoard(nvmlDevice_t device, unsigned in
  * Requires \a NVML_INFOROM_ECC version 1.0 or higher.
  * Requires ECC Mode to be enabled.
  *
- * The total error count is the sum of errors across each of the separate memory systems, i.e. the total set of 
+ * The total error count is the sum of errors across each of the separate memory systems, i.e. the total set of
  * errors across the entire device.
  *
  * See \ref nvmlMemoryErrorType_t for a description of available error types.\n
  * See \ref nvmlEccCounterType_t for a description of available counter types.
  *
  * @param device                               The identifier of the target device
- * @param errorType                            Flag that specifies the type of the errors. 
- * @param counterType                          Flag that specifies the counter-type of the errors. 
+ * @param errorType                            Flag that specifies the type of the errors.
+ * @param counterType                          Flag that specifies the counter-type of the errors.
  * @param eccCounts                            Reference in which to return the specified ECC errors
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if \a eccCounts has been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device, \a errorType or \a counterType is invalid, or \a eccCounts is NULL
@@ -4020,11 +4112,11 @@ nvmlReturn_t DECLDIR nvmlDeviceGetTotalEccErrors(nvmlDevice_t device, nvmlMemory
  * See \ref nvmlEccErrorCounts_t for a description of provided detailed ECC counts.
  *
  * @param device                               The identifier of the target device
- * @param errorType                            Flag that specifies the type of the errors. 
- * @param counterType                          Flag that specifies the counter-type of the errors. 
+ * @param errorType                            Flag that specifies the type of the errors.
+ * @param counterType                          Flag that specifies the counter-type of the errors.
  * @param eccCounts                            Reference in which to return the specified ECC errors
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if \a eccCounts has been populated
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device, \a errorType or \a counterType is invalid, or \a eccCounts is NULL
@@ -4055,14 +4147,14 @@ nvmlReturn_t DECLDIR nvmlDeviceGetDetailedEccErrors(nvmlDevice_t device, nvmlMem
  * See \ref nvmlMemoryErrorType_t for a description of available memory error types.\n
  * See \ref nvmlEccCounterType_t for a description of available counter types.\n
  * See \ref nvmlMemoryLocation_t for a description of available counter locations.\n
- * 
+ *
  * @param device                               The identifier of the target device
  * @param errorType                            Flag that specifies the type of error.
- * @param counterType                          Flag that specifies the counter-type of the errors. 
- * @param locationType                         Specifies the location of the counter. 
+ * @param counterType                          Flag that specifies the counter-type of the errors.
+ * @param locationType                         Specifies the location of the counter.
  * @param count                                Reference in which to return the ECC counter
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if \a count has been populated
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device, \a bitTyp,e \a counterType or \a locationType is
@@ -4089,8 +4181,8 @@ nvmlReturn_t DECLDIR nvmlDeviceGetMemoryErrorCounter(nvmlDevice_t device, nvmlMe
  *
  * @param device                               The identifier of the target device
  * @param utilization                          Reference in which to return the utilization information
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if \a utilization has been populated
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid or \a utilization is NULL
@@ -4129,7 +4221,7 @@ nvmlReturn_t DECLDIR nvmlDeviceGetEncoderUtilization(nvmlDevice_t device, unsign
  * @param device                            The identifier of the target device
  * @param encoderQueryType                  Type of encoder to query
  * @param encoderCapacity                   Reference to an unsigned int for the encoder capacity
- * 
+ *
  * @return
  *         - \ref NVML_SUCCESS                  if \a encoderCapacity is fetched
  *         - \ref NVML_ERROR_UNINITIALIZED      if the library has not been successfully initialized
@@ -4150,7 +4242,7 @@ nvmlReturn_t DECLDIR nvmlDeviceGetEncoderCapacity (nvmlDevice_t device, nvmlEnco
  * @param sessionCount                      Reference to an unsigned int for count of active encoder sessions
  * @param averageFps                        Reference to an unsigned int for trailing average FPS of all active sessions
  * @param averageLatency                    Reference to an unsigned int for encode latency in microseconds
- * 
+ *
  * @return
  *         - \ref NVML_SUCCESS                  if \a sessionCount, \a averageFps and \a averageLatency is fetched
  *         - \ref NVML_ERROR_UNINITIALIZED      if the library has not been successfully initialized
@@ -4179,7 +4271,7 @@ nvmlReturn_t DECLDIR nvmlDeviceGetEncoderStats (nvmlDevice_t device, unsigned in
  * @param device                            The identifier of the target device
  * @param sessionCount                      Reference to caller supplied array size, and returns the number of sessions.
  * @param sessionInfos                      Reference in which to return the session information
- * 
+ *
  * @return
  *         - \ref NVML_SUCCESS                  if \a sessionInfos is fetched
  *         - \ref NVML_ERROR_UNINITIALIZED      if the library has not been successfully initialized
@@ -4274,15 +4366,15 @@ nvmlReturn_t DECLDIR nvmlDeviceGetFBCSessions(nvmlDevice_t device, unsigned int
  * @param device                               The identifier of the target device
  * @param current                              Reference in which to return the current driver model
  * @param pending                              Reference in which to return the pending driver model
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if either \a current and/or \a pending have been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid or both \a current and \a pending are NULL
  *         - \ref NVML_ERROR_NOT_SUPPORTED     if the platform is not windows
  *         - \ref NVML_ERROR_GPU_IS_LOST       if the target GPU has fallen off the bus or is otherwise inaccessible
  *         - \ref NVML_ERROR_UNKNOWN           on any unexpected error
- * 
+ *
  * @see nvmlDeviceSetDriverModel()
  */
 nvmlReturn_t DECLDIR nvmlDeviceGetDriverModel(nvmlDevice_t device, nvmlDriverModel_t *current, nvmlDriverModel_t *pending);
@@ -4292,18 +4384,18 @@ nvmlReturn_t DECLDIR nvmlDeviceGetDriverModel(nvmlDevice_t device, nvmlDriverMod
  *
  * For all products.
  *
- * The VBIOS version may change from time to time. It will not exceed 32 characters in length 
+ * The VBIOS version may change from time to time. It will not exceed 32 characters in length
  * (including the NULL terminator).  See \ref nvmlConstants::NVML_DEVICE_VBIOS_VERSION_BUFFER_SIZE.
  *
  * @param device                               The identifier of the target device
  * @param version                              Reference to which to return the VBIOS version
  * @param length                               The maximum allowed length of the string returned in \a version
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if \a version has been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid, or \a version is NULL
- *         - \ref NVML_ERROR_INSUFFICIENT_SIZE if \a length is too small 
+ *         - \ref NVML_ERROR_INSUFFICIENT_SIZE if \a length is too small
  *         - \ref NVML_ERROR_GPU_IS_LOST       if the target GPU has fallen off the bus or is otherwise inaccessible
  *         - \ref NVML_ERROR_UNKNOWN           on any unexpected error
  */
@@ -4311,21 +4403,21 @@ nvmlReturn_t DECLDIR nvmlDeviceGetVbiosVersion(nvmlDevice_t device, char *versio
 
 /**
  * Get Bridge Chip Information for all the bridge chips on the board.
- * 
+ *
  * For all fully supported products.
  * Only applicable to multi-GPU products.
- * 
+ *
  * @param device                                The identifier of the target device
  * @param bridgeHierarchy                       Reference to the returned bridge chip Hierarchy
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if bridge chip exists
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid, or \a bridgeInfo is NULL
  *         - \ref NVML_ERROR_NOT_SUPPORTED     if bridge chip not supported on the device
  *         - \ref NVML_ERROR_GPU_IS_LOST       if the target GPU has fallen off the bus or is otherwise inaccessible
  *         - \ref NVML_ERROR_UNKNOWN           on any unexpected error
- * 
+ *
  */
 nvmlReturn_t DECLDIR nvmlDeviceGetBridgeChipInfo(nvmlDevice_t device, nvmlBridgeChipHierarchy_t *bridgeHierarchy);
 
@@ -4394,7 +4486,7 @@ nvmlReturn_t DECLDIR nvmlDeviceGetComputeRunningProcesses_v2(nvmlDevice_t device
  *       specific MIG device handles.
  *       Querying per-instance information using MIG device handles is not supported if the device is in vGPU Host virtualization mode.
  *
- * @param device                               The identifier of the target device
+ * @param device                               The device handle or MIG device handle
  * @param infoCount                            Reference in which to provide the \a infos array size, and
  *                                             to return the number of returned elements
  * @param infos                                Reference in which to return the process information
@@ -4415,6 +4507,49 @@ nvmlReturn_t DECLDIR nvmlDeviceGetComputeRunningProcesses_v2(nvmlDevice_t device
  */
 nvmlReturn_t DECLDIR nvmlDeviceGetGraphicsRunningProcesses_v2(nvmlDevice_t device, unsigned int *infoCount, nvmlProcessInfo_t *infos);
 
+/**
+ * Get information about processes with a MPS compute context on a device
+ *
+ * For Volta &tm; or newer fully supported devices.
+ *
+ * This function returns information only about compute running processes (e.g. CUDA application which have
+ * active context) utilizing MPS. Any graphics applications (e.g. using OpenGL, DirectX) won't be listed by
+ * this function.
+ *
+ * To query the current number of running compute processes, call this function with *infoCount = 0. The
+ * return code will be NVML_ERROR_INSUFFICIENT_SIZE, or NVML_SUCCESS if none are running. For this call
+ * \a infos is allowed to be NULL.
+ *
+ * The usedGpuMemory field returned is all of the memory used by the application.
+ *
+ * Keep in mind that information returned by this call is dynamic and the number of elements might change in
+ * time. Allocate more space for \a infos table in case new compute processes are spawned.
+ * 
+ * @note In MIG mode, if device handle is provided, the API returns aggregate information, only if
+ *       the caller has appropriate privileges. Per-instance information can be queried by using
+ *       specific MIG device handles.
+ *       Querying per-instance information using MIG device handles is not supported if the device is in vGPU Host virtualization mode.
+ *
+ * @param device                               The device handle or MIG device handle
+ * @param infoCount                            Reference in which to provide the \a infos array size, and
+ *                                             to return the number of returned elements
+ * @param infos                                Reference in which to return the process information
+ *
+ * @return
+ *         - \ref NVML_SUCCESS                 if \a infoCount and \a infos have been populated
+ *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
+ *         - \ref NVML_ERROR_INSUFFICIENT_SIZE if \a infoCount indicates that the \a infos array is too small
+ *                                             \a infoCount will contain minimal amount of space necessary for
+ *                                             the call to complete
+ *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid, either of \a infoCount or \a infos is NULL
+ *         - \ref NVML_ERROR_GPU_IS_LOST       if the target GPU has fallen off the bus or is otherwise inaccessible
+ *         - \ref NVML_ERROR_NOT_SUPPORTED     if this query is not supported by \a device
+ *         - \ref NVML_ERROR_UNKNOWN           on any unexpected error
+ *
+ * @see \ref nvmlSystemGetProcessName
+ */
+nvmlReturn_t DECLDIR nvmlDeviceGetMPSComputeRunningProcesses_v2(nvmlDevice_t device, unsigned int *infoCount, nvmlProcessInfo_t *infos);
+
 /**
  * Check if the GPU devices are on the same physical board.
  *
@@ -4443,7 +4578,7 @@ nvmlReturn_t DECLDIR nvmlDeviceOnSameBoard(nvmlDevice_t device1, nvmlDevice_t de
  *
  * @param device                               The identifier of the target device
  * @param apiType                              Target API type for this operation
- * @param isRestricted                         Reference in which to return the current restriction 
+ * @param isRestricted                         Reference in which to return the current restriction
  *                                             NVML_FEATURE_ENABLED indicates that the API is root-only
  *                                             NVML_FEATURE_DISABLED indicates that the API is accessible to all users
  *
@@ -4463,24 +4598,24 @@ nvmlReturn_t DECLDIR nvmlDeviceGetAPIRestriction(nvmlDevice_t device, nvmlRestri
 
 /**
  * Gets recent samples for the GPU.
- * 
+ *
  * For Kepler &tm; or newer fully supported devices.
- * 
- * Based on type, this method can be used to fetch the power, utilization or clock samples maintained in the buffer by 
+ *
+ * Based on type, this method can be used to fetch the power, utilization or clock samples maintained in the buffer by
  * the driver.
- * 
+ *
  * Power, Utilization and Clock samples are returned as type "unsigned int" for the union nvmlValue_t.
- * 
- * To get the size of samples that user needs to allocate, the method is invoked with samples set to NULL. 
- * The returned samplesCount will provide the number of samples that can be queried. The user needs to 
+ *
+ * To get the size of samples that user needs to allocate, the method is invoked with samples set to NULL.
+ * The returned samplesCount will provide the number of samples that can be queried. The user needs to
  * allocate the buffer with size as samplesCount * sizeof(nvmlSample_t).
- * 
- * lastSeenTimeStamp represents CPU timestamp in microseconds. Set it to 0 to fetch all the samples maintained by the 
- * underlying buffer. Set lastSeenTimeStamp to one of the timeStamps retrieved from the date of the previous query 
+ *
+ * lastSeenTimeStamp represents CPU timestamp in microseconds. Set it to 0 to fetch all the samples maintained by the
+ * underlying buffer. Set lastSeenTimeStamp to one of the timeStamps retrieved from the date of the previous query
  * to get more recent samples.
- * 
- * This method fetches the number of entries which can be accommodated in the provided samples array, and the 
- * reference samplesCount is updated to indicate how many samples were actually retrieved. The advantage of using this 
+ *
+ * This method fetches the number of entries which can be accommodated in the provided samples array, and the
+ * reference samplesCount is updated to indicate how many samples were actually retrieved. The advantage of using this
  * method for samples in contrast to polling via existing methods is to get get higher frequency data at lower polling cost.
  *
  * @note On MIG-enabled GPUs, querying the following sample types, NVML_GPU_UTILIZATION_SAMPLES, NVML_MEMORY_UTILIZATION_SAMPLES
@@ -4488,15 +4623,15 @@ nvmlReturn_t DECLDIR nvmlDeviceGetAPIRestriction(nvmlDevice_t device, nvmlRestri
  *
  * @param device                        The identifier for the target device
  * @param type                          Type of sampling event
- * @param lastSeenTimeStamp             Return only samples with timestamp greater than lastSeenTimeStamp. 
+ * @param lastSeenTimeStamp             Return only samples with timestamp greater than lastSeenTimeStamp.
  * @param sampleValType                 Output parameter to represent the type of sample value as described in nvmlSampleVal_t
  * @param sampleCount                   Reference to provide the number of elements which can be queried in samples array
  * @param samples                       Reference in which samples are returned
- 
- * @return 
+
+ * @return
  *         - \ref NVML_SUCCESS                 if samples are successfully retrieved
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
- *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid, \a samplesCount is NULL or 
+ *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid, \a samplesCount is NULL or
  *                                             reference to \a sampleCount is 0 for non null \a samples
  *         - \ref NVML_ERROR_NOT_SUPPORTED     if this query is not supported by the device
  *         - \ref NVML_ERROR_GPU_IS_LOST       if the target GPU has fallen off the bus or is otherwise inaccessible
@@ -4508,9 +4643,9 @@ nvmlReturn_t DECLDIR nvmlDeviceGetSamples(nvmlDevice_t device, nvmlSamplingType_
 
 /**
  * Gets Total, Available and Used size of BAR1 memory.
- * 
- * BAR1 is used to map the FB (device memory) so that it can be directly accessed by the CPU or by 3rd party 
- * devices (peer-to-peer on the PCIE bus). 
+ *
+ * BAR1 is used to map the FB (device memory) so that it can be directly accessed by the CPU or by 3rd party
+ * devices (peer-to-peer on the PCIE bus).
  *
  * @note In MIG mode, if device handle is provided, the API returns aggregate
  *       information, only if the caller has appropriate privileges. Per-instance
@@ -4534,20 +4669,20 @@ nvmlReturn_t DECLDIR nvmlDeviceGetSamples(nvmlDevice_t device, nvmlSamplingType_
 nvmlReturn_t DECLDIR nvmlDeviceGetBAR1MemoryInfo(nvmlDevice_t device, nvmlBAR1Memory_t *bar1Memory);
 
 /**
- * Gets the duration of time during which the device was throttled (lower than requested clocks) due to power 
+ * Gets the duration of time during which the device was throttled (lower than requested clocks) due to power
  * or thermal constraints.
  *
  * The method is important to users who are tying to understand if their GPUs throttle at any point during their applications. The
- * difference in violation times at two different reference times gives the indication of GPU throttling event. 
+ * difference in violation times at two different reference times gives the indication of GPU throttling event.
  *
  * Violation for thermal capping is not supported at this time.
- * 
+ *
  * For Kepler &tm; or newer fully supported devices.
  *
  * @param device                               The identifier of the target device
  * @param perfPolicyType                       Represents Performance policy which can trigger GPU throttling
- * @param violTime                             Reference to which violation time related information is returned 
- *                                         
+ * @param violTime                             Reference to which violation time related information is returned
+ *
  *
  * @return
  *         - \ref NVML_SUCCESS                 if violation time is successfully retrieved
@@ -4578,8 +4713,8 @@ nvmlReturn_t DECLDIR nvmlDeviceGetViolationStatus(nvmlDevice_t device, nvmlPerfP
  * @param device                               The identifier of the target device
  * @param mode                                 Reference in which to return the current accounting mode
  *
- * @return 
- *         - \ref NVML_SUCCESS                 if the mode has been successfully retrieved 
+ * @return
+ *         - \ref NVML_SUCCESS                 if the mode has been successfully retrieved
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid or \a mode are NULL
  *         - \ref NVML_ERROR_NOT_SUPPORTED     if the device doesn't support this feature
@@ -4591,10 +4726,10 @@ nvmlReturn_t DECLDIR nvmlDeviceGetAccountingMode(nvmlDevice_t device, nvmlEnable
  * Queries process's accounting stats.
  *
  * For Kepler &tm; or newer fully supported devices.
- * 
+ *
  * Accounting stats capture GPU utilization and other statistics across the lifetime of a process.
  * Accounting stats can be queried during life time of the process and after its termination.
- * The time field in \ref nvmlAccountingStats_t is reported as 0 during the lifetime of the process and 
+ * The time field in \ref nvmlAccountingStats_t is reported as 0 during the lifetime of the process and
  * updated to actual running time after its termination.
  * Accounting stats are kept in a circular buffer, newly created processes overwrite information about old
  * processes.
@@ -4608,12 +4743,12 @@ nvmlReturn_t DECLDIR nvmlDeviceGetAccountingMode(nvmlDevice_t device, nvmlEnable
  * @note In case of pid collision stats of only the latest process (that terminated last) will be reported
  *
  * @warning On Kepler devices per process statistics are accurate only if there's one process running on a GPU.
- * 
+ *
  * @param device                               The identifier of the target device
  * @param pid                                  Process Id of the target process to query stats for
  * @param stats                                Reference in which to return the process's accounting stats
  *
- * @return 
+ * @return
  *         - \ref NVML_SUCCESS                 if stats have been successfully retrieved
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid or \a stats are NULL
@@ -4627,14 +4762,14 @@ nvmlReturn_t DECLDIR nvmlDeviceGetAccountingMode(nvmlDevice_t device, nvmlEnable
 nvmlReturn_t DECLDIR nvmlDeviceGetAccountingStats(nvmlDevice_t device, unsigned int pid, nvmlAccountingStats_t *stats);
 
 /**
- * Queries list of processes that can be queried for accounting stats. The list of processes returned 
+ * Queries list of processes that can be queried for accounting stats. The list of processes returned
  * can be in running or terminated state.
  *
  * For Kepler &tm; or newer fully supported devices.
  *
  * To just query the number of processes ready to be queried, call this function with *count = 0 and
  * pids=NULL. The return code will be NVML_ERROR_INSUFFICIENT_SIZE, or NVML_SUCCESS if list is empty.
- * 
+ *
  * For more details see \ref nvmlDeviceGetAccountingStats.
  *
  * @note In case of PID collision some processes might not be accessible before the circular buffer is full.
@@ -4643,8 +4778,8 @@ nvmlReturn_t DECLDIR nvmlDeviceGetAccountingStats(nvmlDevice_t device, unsigned
  * @param count                                Reference in which to provide the \a pids array size, and
  *                                               to return the number of elements ready to be queried
  * @param pids                                 Reference in which to return list of process ids
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if pids were successfully retrieved
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid or \a count is NULL
@@ -4669,14 +4804,14 @@ nvmlReturn_t DECLDIR nvmlDeviceGetAccountingPids(nvmlDevice_t device, unsigned i
  * @param device                               The identifier of the target device
  * @param bufferSize                           Reference in which to provide the size (in number of elements)
  *                                               of the circular buffer for accounting stats.
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if buffer size was successfully retrieved
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid or \a bufferSize is NULL
  *         - \ref NVML_ERROR_NOT_SUPPORTED     if the device doesn't support this feature or accounting mode is disabled
  *         - \ref NVML_ERROR_UNKNOWN           on any unexpected error
- * 
+ *
  * @see nvmlDeviceGetAccountingStats
  * @see nvmlDeviceGetAccountingPids
  */
@@ -4692,7 +4827,7 @@ nvmlReturn_t DECLDIR nvmlDeviceGetAccountingBufferSize(nvmlDevice_t device, unsi
  * Returns the list of retired pages by source, including pages that are pending retirement
  * The address information provided from this API is the hardware address of the page that was retired.  Note
  * that this does not match the virtual address used in CUDA, but will match the address information in XID 63
- * 
+ *
  * For Kepler &tm; or newer fully supported devices.
  *
  * @param device                            The identifier of the target device
@@ -4701,13 +4836,13 @@ nvmlReturn_t DECLDIR nvmlDeviceGetAccountingBufferSize(nvmlDevice_t device, unsi
  *                                          to return the number of retired pages that match \a cause
  *                                          Set to 0 to query the size without allocating an \a addresses buffer
  * @param addresses                         Buffer to write the page addresses into
- * 
+ *
  * @return
  *         - \ref NVML_SUCCESS                 if \a pageCount was populated and \a addresses was filled
  *         - \ref NVML_ERROR_INSUFFICIENT_SIZE if \a pageCount indicates the buffer is not large enough to store all the
  *                                             matching page addresses.  \a pageCount is set to the needed size.
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
- *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid, \a pageCount is NULL, \a cause is invalid, or 
+ *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid, \a pageCount is NULL, \a cause is invalid, or
  *                                             \a addresses is NULL
  *         - \ref NVML_ERROR_NOT_SUPPORTED     if the device doesn't support this feature
  *         - \ref NVML_ERROR_GPU_IS_LOST       if the target GPU has fallen off the bus or is otherwise inaccessible
@@ -4723,7 +4858,7 @@ nvmlReturn_t DECLDIR nvmlDeviceGetRetiredPages(nvmlDevice_t device, nvmlPageReti
  *
  * \note nvmlDeviceGetRetiredPages_v2 adds an additional timestamps paramter to return the time of each page's
  *       retirement.
- * 
+ *
  * For Kepler &tm; or newer fully supported devices.
  *
  * @param device                            The identifier of the target device
@@ -4733,13 +4868,13 @@ nvmlReturn_t DECLDIR nvmlDeviceGetRetiredPages(nvmlDevice_t device, nvmlPageReti
  *                                          Set to 0 to query the size without allocating an \a addresses buffer
  * @param addresses                         Buffer to write the page addresses into
  * @param timestamps                        Buffer to write the timestamps of page retirement, additional for _v2
- * 
+ *
  * @return
  *         - \ref NVML_SUCCESS                 if \a pageCount was populated and \a addresses was filled
  *         - \ref NVML_ERROR_INSUFFICIENT_SIZE if \a pageCount indicates the buffer is not large enough to store all the
  *                                             matching page addresses.  \a pageCount is set to the needed size.
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
- *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid, \a pageCount is NULL, \a cause is invalid, or 
+ *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid, \a pageCount is NULL, \a cause is invalid, or
  *                                             \a addresses is NULL
  *         - \ref NVML_ERROR_NOT_SUPPORTED     if the device doesn't support this feature
  *         - \ref NVML_ERROR_GPU_IS_LOST       if the target GPU has fallen off the bus or is otherwise inaccessible
@@ -4755,7 +4890,7 @@ nvmlReturn_t DECLDIR nvmlDeviceGetRetiredPages_v2(nvmlDevice_t device, nvmlPageR
  *
  * @param device                            The identifier of the target device
  * @param isPending                         Reference in which to return the pending status
- * 
+ *
  * @return
  *         - \ref NVML_SUCCESS                 if \a isPending was populated
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
@@ -4839,24 +4974,24 @@ nvmlReturn_t DECLDIR nvmlDeviceGetArchitecture(nvmlDevice_t device, nvmlDeviceAr
  * Requires root/admin permissions.
  *
  * This operation takes effect immediately.
- * 
  *
- * <b>Current S-Class products don't provide unique LEDs for each unit. As such, both front 
+ *
+ * <b>Current S-Class products don't provide unique LEDs for each unit. As such, both front
  * and back LEDs will be toggled in unison regardless of which unit is specified with this command.</b>
  *
  * See \ref nvmlLedColor_t for available colors.
  *
  * @param unit                                 The identifier of the target unit
  * @param color                                The target LED color
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if the LED color has been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a unit or \a color is invalid
  *         - \ref NVML_ERROR_NOT_SUPPORTED     if this is not an S-class product
  *         - \ref NVML_ERROR_NO_PERMISSION     if the user doesn't have permission to perform this operation
  *         - \ref NVML_ERROR_UNKNOWN           on any unexpected error
- * 
+ *
  * @see nvmlUnitGetLedState()
  */
 nvmlReturn_t DECLDIR nvmlUnitSetLedState(nvmlUnit_t unit, nvmlLedColor_t color);
@@ -4895,8 +5030,8 @@ nvmlReturn_t DECLDIR nvmlUnitSetLedState(nvmlUnit_t unit, nvmlLedColor_t color);
  *
  * @param device                               The identifier of the target device
  * @param mode                                 The target persistence mode
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if the persistence mode was set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid or \a mode is invalid
@@ -4929,8 +5064,8 @@ nvmlReturn_t DECLDIR nvmlDeviceSetPersistenceMode(nvmlDevice_t device, nvmlEnabl
  *
  * @param device                               The identifier of the target device
  * @param mode                                 The target compute mode
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if the compute mode was set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid or \a mode is invalid
@@ -4959,8 +5094,8 @@ nvmlReturn_t DECLDIR nvmlDeviceSetComputeMode(nvmlDevice_t device, nvmlComputeMo
  *
  * @param device                               The identifier of the target device
  * @param ecc                                  The target ECC mode
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if the ECC mode was set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid or \a ecc is invalid
@@ -4971,7 +5106,7 @@ nvmlReturn_t DECLDIR nvmlDeviceSetComputeMode(nvmlDevice_t device, nvmlComputeMo
  *
  * @see nvmlDeviceGetEccMode()
  */
-nvmlReturn_t DECLDIR nvmlDeviceSetEccMode(nvmlDevice_t device, nvmlEnableState_t ecc);  
+nvmlReturn_t DECLDIR nvmlDeviceSetEccMode(nvmlDevice_t device, nvmlEnableState_t ecc);
 
 /**
  * Clear the ECC error and other memory error counts for the device.
@@ -4991,8 +5126,8 @@ nvmlReturn_t DECLDIR nvmlDeviceSetEccMode(nvmlDevice_t device, nvmlEnableState_t
  *
  * @param device                               The identifier of the target device
  * @param counterType                          Flag that indicates which type of errors should be cleared.
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if the error counts were cleared
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid or \a counterType is invalid
@@ -5001,7 +5136,7 @@ nvmlReturn_t DECLDIR nvmlDeviceSetEccMode(nvmlDevice_t device, nvmlEnableState_t
  *         - \ref NVML_ERROR_GPU_IS_LOST       if the target GPU has fallen off the bus or is otherwise inaccessible
  *         - \ref NVML_ERROR_UNKNOWN           on any unexpected error
  *
- * @see 
+ * @see
  *      - nvmlDeviceGetDetailedEccErrors()
  *      - nvmlDeviceGetTotalEccErrors()
  */
@@ -5015,17 +5150,17 @@ nvmlReturn_t DECLDIR nvmlDeviceClearEccErrorCounts(nvmlDevice_t device, nvmlEccC
  * Requires root/admin permissions.
  *
  * On Windows platforms the device driver can run in either WDDM or WDM (TCC) mode. If a display is attached
- * to the device it must run in WDDM mode.  
+ * to the device it must run in WDDM mode.
  *
  * It is possible to force the change to WDM (TCC) while the display is still attached with a force flag (nvmlFlagForce).
  * This should only be done if the host is subsequently powered down and the display is detached from the device
- * before the next reboot. 
+ * before the next reboot.
  *
  * This operation takes effect after the next reboot.
- * 
+ *
  * Windows driver model may only be set to WDDM when running in DEFAULT compute mode.
  *
- * Change driver model to WDDM is not supported when GPU doesn't support graphics acceleration or 
+ * Change driver model to WDDM is not supported when GPU doesn't support graphics acceleration or
  * will not support it after reboot. See \ref nvmlDeviceSetGpuOperationMode.
  *
  * See \ref nvmlDriverModel_t for details on available driver models.
@@ -5034,8 +5169,8 @@ nvmlReturn_t DECLDIR nvmlDeviceClearEccErrorCounts(nvmlDevice_t device, nvmlEccC
  * @param device                               The identifier of the target device
  * @param driverModel                          The target driver model
  * @param flags                                Flags that change the default behavior
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if the driver model has been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid or \a driverModel is invalid
@@ -5043,7 +5178,7 @@ nvmlReturn_t DECLDIR nvmlDeviceClearEccErrorCounts(nvmlDevice_t device, nvmlEccC
  *         - \ref NVML_ERROR_NO_PERMISSION     if the user doesn't have permission to perform this operation
  *         - \ref NVML_ERROR_GPU_IS_LOST       if the target GPU has fallen off the bus or is otherwise inaccessible
  *         - \ref NVML_ERROR_UNKNOWN           on any unexpected error
- * 
+ *
  * @see nvmlDeviceGetDriverModel()
  */
 nvmlReturn_t DECLDIR nvmlDeviceSetDriverModel(nvmlDevice_t device, nvmlDriverModel_t driverModel, unsigned int flags);
@@ -5121,6 +5256,60 @@ nvmlReturn_t DECLDIR nvmlDeviceSetGpuLockedClocks(nvmlDevice_t device, unsigned
  */
 nvmlReturn_t DECLDIR nvmlDeviceResetGpuLockedClocks(nvmlDevice_t device);
 
+/**
+ * Set memory clocks that device will lock to.
+ *
+ * Sets the device's memory clocks to the value in the range of minMemClockMHz to maxMemClockMHz.
+ * Setting this will supersede application clock values and take effect regardless of whether a cuda app is running.
+ * See /ref nvmlDeviceSetApplicationsClocks
+ *
+ * Can be used as a setting to request constant performance.
+ *
+ * Requires root/admin permissions.
+ *
+ * After system reboot or driver reload applications clocks go back to their default value.
+ * See \ref nvmlDeviceResetMemoryLockedClocks.
+ *
+ * For Ampere &tm; or newer fully supported devices.
+ *
+ * @param device                               The identifier of the target device
+ * @param minMemClockMHz                       Requested minimum memory clock in MHz
+ * @param maxMemClockMHz                       Requested maximum memory clock in MHz
+ *
+ * @return
+ *         - \ref NVML_SUCCESS                 if new settings were successfully set
+ *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
+ *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid or \a minGpuClockMHz and \a maxGpuClockMHz
+ *                                                 is not a valid clock combination
+ *         - \ref NVML_ERROR_NO_PERMISSION     if the user doesn't have permission to perform this operation
+ *         - \ref NVML_ERROR_NOT_SUPPORTED     if the device doesn't support this feature
+ *         - \ref NVML_ERROR_GPU_IS_LOST       if the target GPU has fallen off the bus or is otherwise inaccessible
+ *         - \ref NVML_ERROR_UNKNOWN           on any unexpected error
+ */
+nvmlReturn_t DECLDIR nvmlDeviceSetMemoryLockedClocks(nvmlDevice_t device, unsigned int minMemClockMHz, unsigned int maxMemClockMHz);
+
+/**
+ * Resets the memory clock to the default value
+ *
+ * This is the memory clock that will be used after system reboot or driver reload.
+ * Default values are idle clocks, but the current values can be changed using \ref nvmlDeviceSetApplicationsClocks.
+ *
+ * @see nvmlDeviceSetMemoryLockedClocks
+ *
+ * For Ampere &tm; or newer fully supported devices.
+ *
+ * @param device                               The identifier of the target device
+ *
+ * @return
+ *         - \ref NVML_SUCCESS                 if new settings were successfully set
+ *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
+ *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid
+ *         - \ref NVML_ERROR_NOT_SUPPORTED     if the device does not support this feature
+ *         - \ref NVML_ERROR_GPU_IS_LOST       if the target GPU has fallen off the bus or is otherwise inaccessible
+ *         - \ref NVML_ERROR_UNKNOWN           on any unexpected error
+ */
+nvmlReturn_t DECLDIR nvmlDeviceResetMemoryLockedClocks(nvmlDevice_t device);
+
 /**
  * Set clocks that applications will lock to.
  *
@@ -5163,8 +5352,31 @@ nvmlReturn_t DECLDIR nvmlDeviceResetGpuLockedClocks(nvmlDevice_t device);
 nvmlReturn_t DECLDIR nvmlDeviceSetApplicationsClocks(nvmlDevice_t device, unsigned int memClockMHz, unsigned int graphicsClockMHz);
 
 /**
- * Set new power limit of this device.
+ * Retrieves the frequency monitor fault status for the device.
+ *
+ * For Ampere &tm; or newer fully supported devices.
+ * Requires root user.
+ *
+ * See \ref nvmlClkMonStatus_t for details on decoding the status output.
+ *
+ * @param device                               The identifier of the target device
+ * @param status                               Reference in which to return the clkmon fault status
  * 
+ * @return 
+ *         - \ref NVML_SUCCESS                 if \a status has been set
+ *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
+ *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid or \a status is NULL
+ *         - \ref NVML_ERROR_NOT_SUPPORTED     if the device does not support this feature
+ *         - \ref NVML_ERROR_GPU_IS_LOST       if the target GPU has fallen off the bus or is otherwise inaccessible
+ *         - \ref NVML_ERROR_UNKNOWN           on any unexpected error
+ *
+ * @see nvmlDeviceGetClkMonStatus()
+ */
+nvmlReturn_t DECLDIR nvmlDeviceGetClkMonStatus(nvmlDevice_t device, nvmlClkMonStatus_t *status);
+
+/**
+ * Set new power limit of this device.
+ *
  * For Kepler &tm; or newer fully supported devices.
  * Requires root/admin permissions.
  *
@@ -5175,8 +5387,8 @@ nvmlReturn_t DECLDIR nvmlDeviceSetApplicationsClocks(nvmlDevice_t device, unsign
  *
  * @param device                               The identifier of the target device
  * @param limit                                Power management limit in milliwatts to set
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if \a limit has been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid or \a defaultLimit is out of range
@@ -5196,17 +5408,17 @@ nvmlReturn_t DECLDIR nvmlDeviceSetPowerManagementLimit(nvmlDevice_t device, unsi
  * Modes \ref NVML_GOM_LOW_DP and \ref NVML_GOM_ALL_ON are supported on fully supported GeForce products.
  * Not supported on Quadro &reg; and Tesla &tm; C-class products.
  * Requires root/admin permissions.
- * 
- * Changing GOMs requires a reboot. 
+ *
+ * Changing GOMs requires a reboot.
  * The reboot requirement might be removed in the future.
  *
  * Compute only GOMs don't support graphics acceleration. Under windows switching to these GOMs when
  * pending driver model is WDDM is not supported. See \ref nvmlDeviceSetDriverModel.
- * 
+ *
  * @param device                               The identifier of the target device
  * @param mode                                 Target GOM
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if \a mode has been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid or \a mode incorrect
@@ -5225,7 +5437,7 @@ nvmlReturn_t DECLDIR nvmlDeviceSetGpuOperationMode(nvmlDevice_t device, nvmlGpuO
  * This method can be used by a root/admin user to give non-root/admin access to certain otherwise-restricted APIs.
  * The new setting lasts for the lifetime of the NVIDIA driver; it is not persistent. See \a nvmlDeviceGetAPIRestriction
  * to query the current restriction settings.
- * 
+ *
  * For Kepler &tm; or newer fully supported devices.
  * Requires root/admin permissions.
  *
@@ -5238,7 +5450,7 @@ nvmlReturn_t DECLDIR nvmlDeviceSetGpuOperationMode(nvmlDevice_t device, nvmlGpuO
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device is invalid or \a apiType incorrect
  *         - \ref NVML_ERROR_NOT_SUPPORTED     if the device does not support changing API restrictions or the device does not support
- *                                                 the feature that api restrictions are being set for (E.G. Enabling/disabling auto 
+ *                                                 the feature that api restrictions are being set for (E.G. Enabling/disabling auto
  *                                                 boosted clocks is not supported by the device)
  *         - \ref NVML_ERROR_NO_PERMISSION     if the user doesn't have permission to perform this operation
  *         - \ref NVML_ERROR_GPU_IS_LOST       if the target GPU has fallen off the bus or is otherwise inaccessible
@@ -5251,7 +5463,7 @@ nvmlReturn_t DECLDIR nvmlDeviceSetAPIRestriction(nvmlDevice_t device, nvmlRestri
 /**
  * @}
  */
- 
+
 /** @addtogroup nvmlAccountingStats
  *  @{
  */
@@ -5264,7 +5476,7 @@ nvmlReturn_t DECLDIR nvmlDeviceSetAPIRestriction(nvmlDevice_t device, nvmlRestri
  *
  * @note This setting is not persistent and will default to disabled after driver unloads.
  *       Enable persistence mode to be sure the setting doesn't switch off to disabled.
- * 
+ *
  * @note Enabling accounting mode has no negative impact on the GPU performance.
  *
  * @note Disabling accounting clears all accounting pids information.
@@ -5278,7 +5490,7 @@ nvmlReturn_t DECLDIR nvmlDeviceSetAPIRestriction(nvmlDevice_t device, nvmlRestri
  * @param device                               The identifier of the target device
  * @param mode                                 The target accounting mode
  *
- * @return 
+ * @return
  *         - \ref NVML_SUCCESS                 if the new mode has been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device or \a mode are invalid
@@ -5300,8 +5512,8 @@ nvmlReturn_t DECLDIR nvmlDeviceSetAccountingMode(nvmlDevice_t device, nvmlEnable
  *
  * @param device                               The identifier of the target device
  *
- * @return 
- *         - \ref NVML_SUCCESS                 if accounting information has been cleared 
+ * @return
+ *         - \ref NVML_SUCCESS                 if accounting information has been cleared
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device are invalid
  *         - \ref NVML_ERROR_NOT_SUPPORTED     if the device doesn't support this feature
@@ -5327,10 +5539,10 @@ nvmlReturn_t DECLDIR nvmlDeviceClearAccountingPids(nvmlDevice_t device);
  * @param device                               The identifier of the target device
  * @param link                                 Specifies the NvLink link to be queried
  * @param isActive                             \a nvmlEnableState_t where NVML_FEATURE_ENABLED indicates that
- *                                             the link is active and NVML_FEATURE_DISABLED indicates it 
+ *                                             the link is active and NVML_FEATURE_DISABLED indicates it
  *                                             is inactive
  *
- * @return 
+ * @return
  *         - \ref NVML_SUCCESS                 if \a isActive has been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device or \a link is invalid or \a isActive is NULL
@@ -5348,7 +5560,7 @@ nvmlReturn_t DECLDIR nvmlDeviceGetNvLinkState(nvmlDevice_t device, unsigned int
  * @param link                                 Specifies the NvLink link to be queried
  * @param version                              Requested NvLink version
  *
- * @return 
+ * @return
  *         - \ref NVML_SUCCESS                 if \a version has been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device or \a link is invalid or \a version is NULL
@@ -5369,7 +5581,7 @@ nvmlReturn_t DECLDIR nvmlDeviceGetNvLinkVersion(nvmlDevice_t device, unsigned in
  * @param capability                           Specifies the \a nvmlNvLinkCapability_t to be queried
  * @param capResult                            A boolean for the queried capability indicating that feature is available
  *
- * @return 
+ * @return
  *         - \ref NVML_SUCCESS                 if \a capResult has been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device, \a link, or \a capability is invalid or \a capResult is NULL
@@ -5377,19 +5589,19 @@ nvmlReturn_t DECLDIR nvmlDeviceGetNvLinkVersion(nvmlDevice_t device, unsigned in
  *         - \ref NVML_ERROR_UNKNOWN           on any unexpected error
  */
 nvmlReturn_t DECLDIR nvmlDeviceGetNvLinkCapability(nvmlDevice_t device, unsigned int link,
-                                                   nvmlNvLinkCapability_t capability, unsigned int *capResult); 
+                                                   nvmlNvLinkCapability_t capability, unsigned int *capResult);
 
 /**
- * Retrieves the PCI information for the remote node on a NvLink link 
+ * Retrieves the PCI information for the remote node on a NvLink link
  * Note: pciSubSystemId is not filled in this function and is indeterminate
  *
  * For Pascal &tm; or newer fully supported devices.
  *
  * @param device                               The identifier of the target device
  * @param link                                 Specifies the NvLink link to be queried
- * @param pci                                  \a nvmlPciInfo_t of the remote node for the specified link                            
+ * @param pci                                  \a nvmlPciInfo_t of the remote node for the specified link
  *
- * @return 
+ * @return
  *         - \ref NVML_SUCCESS                 if \a pci has been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device or \a link is invalid or \a pci is NULL
@@ -5409,7 +5621,7 @@ nvmlReturn_t DECLDIR nvmlDeviceGetNvLinkRemotePciInfo_v2(nvmlDevice_t device, un
  * @param counter                              Specifies the NvLink counter to be queried
  * @param counterValue                         Returned counter value
  *
- * @return 
+ * @return
  *         - \ref NVML_SUCCESS                 if \a counter has been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device, \a link, or \a counter is invalid or \a counterValue is NULL
@@ -5428,7 +5640,7 @@ nvmlReturn_t DECLDIR nvmlDeviceGetNvLinkErrorCounter(nvmlDevice_t device, unsign
  * @param device                               The identifier of the target device
  * @param link                                 Specifies the NvLink link to be queried
  *
- * @return 
+ * @return
  *         - \ref NVML_SUCCESS                 if the reset is successful
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device or \a link is invalid
@@ -5452,10 +5664,10 @@ nvmlReturn_t DECLDIR nvmlDeviceResetNvLinkErrorCounters(nvmlDevice_t device, uns
  * @param control                              A reference to the \a nvmlNvLinkUtilizationControl_t to set
  * @param reset                                Resets the counters on set if non-zero
  *
- * @return 
+ * @return
  *         - \ref NVML_SUCCESS                 if the control has been set successfully
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
- *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device, \a counter, \a link, or \a control is invalid 
+ *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device, \a counter, \a link, or \a control is invalid
  *         - \ref NVML_ERROR_NOT_SUPPORTED     if the device doesn't support this feature
  *         - \ref NVML_ERROR_UNKNOWN           on any unexpected error
  */
@@ -5475,10 +5687,10 @@ nvmlReturn_t DECLDIR nvmlDeviceSetNvLinkUtilizationControl(nvmlDevice_t device,
  * @param link                                 Specifies the NvLink link to be queried
  * @param control                              A reference to the \a nvmlNvLinkUtilizationControl_t to place information
  *
- * @return 
+ * @return
  *         - \ref NVML_SUCCESS                 if the control has been set successfully
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
- *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device, \a counter, \a link, or \a control is invalid 
+ *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device, \a counter, \a link, or \a control is invalid
  *         - \ref NVML_ERROR_NOT_SUPPORTED     if the device doesn't support this feature
  *         - \ref NVML_ERROR_UNKNOWN           on any unexpected error
  */
@@ -5501,20 +5713,20 @@ nvmlReturn_t DECLDIR nvmlDeviceGetNvLinkUtilizationControl(nvmlDevice_t device,
  * @param rxcounter                            Receive counter return value
  * @param txcounter                            Transmit counter return value
  *
- * @return 
+ * @return
  *         - \ref NVML_SUCCESS                 if \a rxcounter and \a txcounter have been successfully set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device, \a counter, or \a link is invalid or \a rxcounter or \a txcounter are NULL
  *         - \ref NVML_ERROR_NOT_SUPPORTED     if the device doesn't support this feature
  *         - \ref NVML_ERROR_UNKNOWN           on any unexpected error
  */
-nvmlReturn_t DECLDIR nvmlDeviceGetNvLinkUtilizationCounter(nvmlDevice_t device, unsigned int link, unsigned int counter, 
+nvmlReturn_t DECLDIR nvmlDeviceGetNvLinkUtilizationCounter(nvmlDevice_t device, unsigned int link, unsigned int counter,
                                                            unsigned long long *rxcounter, unsigned long long *txcounter);
 
 /**
  * Deprecated: Freezing NVLINK utilization counters is no longer supported.
  *
- * Freeze the NVLINK utilization counters 
+ * Freeze the NVLINK utilization counters
  * Both the receive and transmit counters are operated on by this function
  *
  * For Pascal &tm; or newer fully supported devices.
@@ -5525,20 +5737,20 @@ nvmlReturn_t DECLDIR nvmlDeviceGetNvLinkUtilizationCounter(nvmlDevice_t device,
  * @param freeze                               NVML_FEATURE_ENABLED = freeze the receive and transmit counters
  *                                             NVML_FEATURE_DISABLED = unfreeze the receive and transmit counters
  *
- * @return 
+ * @return
  *         - \ref NVML_SUCCESS                 if counters were successfully frozen or unfrozen
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device, \a link, \a counter, or \a freeze is invalid
  *         - \ref NVML_ERROR_NOT_SUPPORTED     if the device doesn't support this feature
  *         - \ref NVML_ERROR_UNKNOWN           on any unexpected error
  */
-nvmlReturn_t DECLDIR nvmlDeviceFreezeNvLinkUtilizationCounter (nvmlDevice_t device, unsigned int link, 
+nvmlReturn_t DECLDIR nvmlDeviceFreezeNvLinkUtilizationCounter (nvmlDevice_t device, unsigned int link,
                                             unsigned int counter, nvmlEnableState_t freeze);
 
 /**
  * Deprecated: Resetting NVLINK utilization counters is no longer supported.
  *
- * Reset the NVLINK utilization counters 
+ * Reset the NVLINK utilization counters
  * Both the receive and transmit counters are operated on by this function
  *
  * For Pascal &tm; or newer fully supported devices.
@@ -5547,7 +5759,7 @@ nvmlReturn_t DECLDIR nvmlDeviceFreezeNvLinkUtilizationCounter (nvmlDevice_t devi
  * @param link                                 Specifies the NvLink link to be reset
  * @param counter                              Specifies the counter that should be reset (0 or 1)
  *
- * @return 
+ * @return
  *         - \ref NVML_SUCCESS                 if counters were successfully reset
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a device, \a link, or \a counter is invalid
@@ -5556,11 +5768,30 @@ nvmlReturn_t DECLDIR nvmlDeviceFreezeNvLinkUtilizationCounter (nvmlDevice_t devi
  */
 nvmlReturn_t DECLDIR nvmlDeviceResetNvLinkUtilizationCounter (nvmlDevice_t device, unsigned int link, unsigned int counter);
 
+/**
+* Get the NVLink device type of the remote device connected over the given link.
+*
+* @param device                                The device handle of the target GPU
+* @param link                                  The NVLink link index on the target GPU
+* @param pNvLinkDeviceType                     Pointer in which the output remote device type is returned
+*
+* @return
+*         - \ref NVML_SUCCESS                  if \a pNvLinkDeviceType has been set
+*         - \ref NVML_ERROR_UNINITIALIZED      if the library has not been successfully initialized
+*         - \ref NVML_ERROR_NOT_SUPPORTED      if NVLink is not supported
+*         - \ref NVML_ERROR_INVALID_ARGUMENT   if \a device or \a link is invalid, or
+*                                              \a pNvLinkDeviceType is NULL
+*         - \ref NVML_ERROR_GPU_IS_LOST        if the target GPU has fallen off the bus or is
+*                                              otherwise inaccessible
+*         - \ref NVML_ERROR_UNKNOWN            on any unexpected error
+*/
+nvmlReturn_t DECLDIR nvmlDeviceGetNvLinkRemoteDeviceType(nvmlDevice_t device, unsigned int link, nvmlIntNvLinkDeviceType_t *pNvLinkDeviceType);
+
 /** @} */
 
 /***************************************************************************************************/
 /** @defgroup nvmlEvents Event Handling Methods
- * This chapter describes methods that NVML can perform against each device to register and wait for 
+ * This chapter describes methods that NVML can perform against each device to register and wait for
  * some event to occur.
  *  @{
  */
@@ -5572,13 +5803,13 @@ nvmlReturn_t DECLDIR nvmlDeviceResetNvLinkUtilizationCounter (nvmlDevice_t devic
  *
  * For Fermi &tm; or newer fully supported devices.
  * @param set                                  Reference in which to return the event handle
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if the event has been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a set is NULL
  *         - \ref NVML_ERROR_UNKNOWN           on any unexpected error
- * 
+ *
  * @see nvmlEventSetFree
  */
 nvmlReturn_t DECLDIR nvmlEventSetCreate(nvmlEventSet_t *set);
@@ -5605,15 +5836,15 @@ nvmlReturn_t DECLDIR nvmlEventSetCreate(nvmlEventSet_t *set);
  * @param device                               The identifier of the target device
  * @param eventTypes                           Bitmask of \ref nvmlEventType to record
  * @param set                                  Set to which add new event types
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if the event has been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a eventTypes is invalid or \a set is NULL
  *         - \ref NVML_ERROR_NOT_SUPPORTED     if the platform does not support this feature or some of requested event types
  *         - \ref NVML_ERROR_GPU_IS_LOST       if the target GPU has fallen off the bus or is otherwise inaccessible
  *         - \ref NVML_ERROR_UNKNOWN           on any unexpected error
- * 
+ *
  * @see nvmlEventType
  * @see nvmlDeviceGetSupportedEventTypes
  * @see nvmlEventSetWait
@@ -5630,14 +5861,14 @@ nvmlReturn_t DECLDIR nvmlDeviceRegisterEvents(nvmlDevice_t device, unsigned long
  *
  * @param device                               The identifier of the target device
  * @param eventTypes                           Reference in which to return bitmask of supported events
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if the eventTypes has been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a eventType is NULL
  *         - \ref NVML_ERROR_GPU_IS_LOST       if the target GPU has fallen off the bus or is otherwise inaccessible
  *         - \ref NVML_ERROR_UNKNOWN           on any unexpected error
- * 
+ *
  * @see nvmlEventType
  * @see nvmlDeviceRegisterEvents
  */
@@ -5649,7 +5880,7 @@ nvmlReturn_t DECLDIR nvmlDeviceGetSupportedEventTypes(nvmlDevice_t device, unsig
  * For Fermi &tm; or newer fully supported devices.
  *
  * If some events are ready to be delivered at the time of the call, function returns immediately.
- * If there are no events ready to be delivered, function sleeps till event arrives 
+ * If there are no events ready to be delivered, function sleeps till event arrives
  * but not longer than specified timeout. This function in certain conditions can return before
  * specified timeout passes (e.g. when interrupt arrives)
  *
@@ -5668,15 +5899,15 @@ nvmlReturn_t DECLDIR nvmlDeviceGetSupportedEventTypes(nvmlDevice_t device, unsig
  * @param set                                  Reference to set of events to wait on
  * @param data                                 Reference in which to return event data
  * @param timeoutms                            Maximum amount of wait time in milliseconds for registered event
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if the data has been set
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a data is NULL
  *         - \ref NVML_ERROR_TIMEOUT           if no event arrived in specified timeout or interrupt arrived
  *         - \ref NVML_ERROR_GPU_IS_LOST       if a GPU has fallen off the bus or is otherwise inaccessible
  *         - \ref NVML_ERROR_UNKNOWN           on any unexpected error
- * 
+ *
  * @see nvmlEventType
  * @see nvmlDeviceRegisterEvents
  */
@@ -5687,13 +5918,13 @@ nvmlReturn_t DECLDIR nvmlEventSetWait_v2(nvmlEventSet_t set, nvmlEventData_t * d
  *
  * For Fermi &tm; or newer fully supported devices.
  *
- * @param set                                  Reference to events to be released 
- * 
- * @return 
+ * @param set                                  Reference to events to be released
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if the event has been successfully released
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_UNKNOWN           on any unexpected error
- * 
+ *
  * @see nvmlDeviceRegisterEvents
  */
 nvmlReturn_t DECLDIR nvmlEventSetFree(nvmlEventSet_t set);
@@ -5701,7 +5932,7 @@ nvmlReturn_t DECLDIR nvmlEventSetFree(nvmlEventSet_t set);
 /** @} */
 
 /***************************************************************************************************/
-/** @defgroup nvmlZPI Drain states 
+/** @defgroup nvmlZPI Drain states
  * This chapter describes methods that NVML can perform against each device to control their drain state
  * and recognition by NVML and NVIDIA kernel driver. These methods can be used with out-of-band tools to
  * power on/off GPUs, enable robust reset scenarios, etc.
@@ -5715,14 +5946,14 @@ nvmlReturn_t DECLDIR nvmlEventSetFree(nvmlEventSet_t set);
  * this call is made.
  * Must be called as administrator.
  * For Linux only.
- * 
+ *
  * For Pascal &tm; or newer fully supported devices.
  * Some Kepler devices supported.
  *
  * @param pciInfo                              The PCI address of the GPU drain state to be modified
  * @param newState                             The drain state that should be entered, see \ref nvmlEnableState_t
  *
- * @return 
+ * @return
  *         - \ref NVML_SUCCESS                 if counters were successfully reset
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a nvmlIndex or \a newState is invalid
@@ -5737,14 +5968,14 @@ nvmlReturn_t DECLDIR nvmlDeviceModifyDrainState (nvmlPciInfo_t *pciInfo, nvmlEna
  * Query the drain state of a GPU.  This method is used to check if a GPU is in a currently draining
  * state.
  * For Linux only.
- * 
+ *
  * For Pascal &tm; or newer fully supported devices.
  * Some Kepler devices supported.
  *
  * @param pciInfo                              The PCI address of the GPU drain state to be queried
  * @param currentState                         The current drain state for this GPU, see \ref nvmlEnableState_t
  *
- * @return 
+ * @return
  *         - \ref NVML_SUCCESS                 if counters were successfully reset
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a nvmlIndex or \a currentState is invalid
@@ -5758,14 +5989,14 @@ nvmlReturn_t DECLDIR nvmlDeviceQueryDrainState (nvmlPciInfo_t *pciInfo, nvmlEnab
  * as long as no other processes are attached. If other processes are attached, this call will return
  * NVML_ERROR_IN_USE and the GPU will be returned to its original "draining" state. Note: the
  * only situation where a process can still be attached after nvmlDeviceModifyDrainState() is called
- * to initiate the draining state is if that process was using, and is still using, a GPU before the 
+ * to initiate the draining state is if that process was using, and is still using, a GPU before the
  * call was made. Also note, persistence mode counts as an attachment to the GPU thus it must be disabled
  * prior to this call.
  *
  * For long-running NVML processes please note that this will change the enumeration of current GPUs.
  * For example, if there are four GPUs present and GPU1 is removed, the new enumeration will be 0-2.
  * Also, device handles after the removed GPU will not be valid and must be re-established.
- * Must be run as administrator. 
+ * Must be run as administrator.
  * For Linux only.
  *
  * For Pascal &tm; or newer fully supported devices.
@@ -5787,7 +6018,7 @@ nvmlReturn_t DECLDIR nvmlDeviceRemoveGpu_v2(nvmlPciInfo_t *pciInfo, nvmlDetachGp
 
 /**
  * Request the OS and the NVIDIA kernel driver to rediscover a portion of the PCI subsystem looking for GPUs that
- * were previously removed. The portion of the PCI tree can be narrowed by specifying a domain, bus, and device.  
+ * were previously removed. The portion of the PCI tree can be narrowed by specifying a domain, bus, and device.
  * If all are zeroes then the entire PCI tree will be searched.  Please note that for long-running NVML processes
  * the enumeration will change based on how many GPUs are discovered and where they are inserted in bus order.
  *
@@ -5796,14 +6027,14 @@ nvmlReturn_t DECLDIR nvmlDeviceRemoveGpu_v2(nvmlPciInfo_t *pciInfo, nvmlDetachGp
  *
  * Must be run as administrator.
  * For Linux only.
- * 
+ *
  * For Pascal &tm; or newer fully supported devices.
  * Some Kepler devices supported.
  *
  * @param pciInfo                              The PCI tree to be searched.  Only the domain, bus, and device
  *                                             fields are used in this call.
  *
- * @return 
+ * @return
  *         - \ref NVML_SUCCESS                 if counters were successfully reset
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a pciInfo is invalid
@@ -5865,8 +6096,8 @@ nvmlReturn_t DECLDIR nvmlDeviceGetFieldValues(nvmlDevice_t device, int valuesCou
  *
  * @param device                    Identifier of the target device
  * @param pVirtualMode              Reference to virtualization mode. One of NVML_GPU_VIRTUALIZATION_?
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                  if \a pVirtualMode is fetched
  *         - \ref NVML_ERROR_UNINITIALIZED      if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT   if \a device is invalid or \a pVirtualMode is NULL
@@ -5901,7 +6132,7 @@ nvmlReturn_t DECLDIR nvmlDeviceGetHostVgpuMode(nvmlDevice_t device, nvmlHostVgpu
  * @param device                    Identifier of the target device
  * @param virtualMode               virtualization mode. One of NVML_GPU_VIRTUALIZATION_?
  *
- * @return 
+ * @return
  *         - \ref NVML_SUCCESS                  if \a pVirtualMode is set
  *         - \ref NVML_ERROR_UNINITIALIZED      if the library has not been successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT   if \a device is invalid or \a pVirtualMode is NULL
@@ -5925,7 +6156,7 @@ nvmlReturn_t DECLDIR nvmlDeviceSetVirtualizationMode(nvmlDevice_t device, nvmlGp
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a pGridLicensableFeatures is NULL
  *         - \ref NVML_ERROR_UNKNOWN           on any unexpected error
  */
-nvmlReturn_t DECLDIR nvmlDeviceGetGridLicensableFeatures_v3(nvmlDevice_t device, nvmlGridLicensableFeatures_t *pGridLicensableFeatures);
+nvmlReturn_t DECLDIR nvmlDeviceGetGridLicensableFeatures_v4(nvmlDevice_t device, nvmlGridLicensableFeatures_t *pGridLicensableFeatures);
 
 /**
  * Retrieves the current utilization and process ID
@@ -6641,7 +6872,7 @@ typedef enum nvmlVgpuVmCompatibility_enum
     NVML_VGPU_VM_COMPATIBILITY_COLD         = 0x1,    //!< vGPU is runnable from a cold / powered-off state (ACPI S5)
     NVML_VGPU_VM_COMPATIBILITY_HIBERNATE    = 0x2,    //!< vGPU is runnable from a hibernated state (ACPI S4)
     NVML_VGPU_VM_COMPATIBILITY_SLEEP        = 0x4,    //!< vGPU is runnable from a sleeped state (ACPI S3)
-    NVML_VGPU_VM_COMPATIBILITY_LIVE         = 0x8,    //!< vGPU is runnable from a live/paused (ACPI S0)
+    NVML_VGPU_VM_COMPATIBILITY_LIVE         = 0x8     //!< vGPU is runnable from a live/paused (ACPI S0)
 } nvmlVgpuVmCompatibility_t;
 
 /**
@@ -6653,7 +6884,7 @@ typedef enum nvmlVgpuPgpuCompatibilityLimitCode_enum
     NVML_VGPU_COMPATIBILITY_LIMIT_HOST_DRIVER   = 0x1,           //!< ompatibility is limited by host driver version.
     NVML_VGPU_COMPATIBILITY_LIMIT_GUEST_DRIVER  = 0x2,           //!< Compatibility is limited by guest driver version.
     NVML_VGPU_COMPATIBILITY_LIMIT_GPU           = 0x4,           //!< Compatibility is limited by GPU hardware.
-    NVML_VGPU_COMPATIBILITY_LIMIT_OTHER         = 0x80000000,    //!< Compatibility is limited by an undefined factor.
+    NVML_VGPU_COMPATIBILITY_LIMIT_OTHER         = 0x80000000     //!< Compatibility is limited by an undefined factor.
 } nvmlVgpuPgpuCompatibilityLimitCode_t;
 
 /**
@@ -6764,7 +6995,7 @@ nvmlReturn_t DECLDIR nvmlDeviceGetPgpuMetadataString(nvmlDevice_t device, char *
  * Virtual GPU (vGPU) version
  *
  * The NVIDIA vGPU Manager and the guest drivers are tagged with a range of supported vGPU versions. This determines the range of NVIDIA guest driver versions that
- * are compatible for vGPU feature support with a given NVIDIA vGPU Manager. For vGPU feature support, the range of supported versions for the NVIDIA vGPU Manager 
+ * are compatible for vGPU feature support with a given NVIDIA vGPU Manager. For vGPU feature support, the range of supported versions for the NVIDIA vGPU Manager
  * and the guest driver must overlap. Otherwise, the guest driver fails to load in the VM.
  *
  * When the NVIDIA guest driver loads, either when the VM is booted or when the driver is installed or upgraded, a negotiation occurs between the guest driver
@@ -6805,7 +7036,7 @@ nvmlReturn_t DECLDIR nvmlGetVgpuVersion(nvmlVgpuVersion_t *supported, nvmlVgpuVe
  *
  * @note 1. The range set by the administrator must be a subset of the preset range that the NVIDIA vGPU Manager supports. Otherwise, an error is returned.
  *       2. If the range of supported guest driver versions does not overlap the range set by the administrator, the guest driver fails to load.
- *       3. If the range of supported guest driver versions overlaps the range set by the administrator, the guest driver will load with a negotiated 
+ *       3. If the range of supported guest driver versions overlaps the range set by the administrator, the guest driver will load with a negotiated
  *          vGPU version that is the maximum value in the overlapping range.
  *       4. No VMs must be running on the host when this function is called. If a VM is running on the host, the call to this function fails.
  *
@@ -6822,7 +7053,7 @@ nvmlReturn_t DECLDIR nvmlSetVgpuVersion(nvmlVgpuVersion_t *vgpuVersion);
 /** @} */
 
 /***************************************************************************************************/
-/** @defgroup nvmlUtil vGPU Utilization and Accounting 
+/** @defgroup nvmlUtil vGPU Utilization and Accounting
  * This chapter describes operations that are associated with vGPU Utilization and Accounting.
  *  @{
  */
@@ -7032,53 +7263,53 @@ nvmlReturn_t DECLDIR nvmlVgpuInstanceClearAccountingPids(nvmlVgpuInstance_t vgpu
 /** @} */
 
 /***************************************************************************************************/
-/** @defgroup nvmlGpuBlacklistQueries GPU Blacklist Queries
- * This chapter describes NVML operations that are associated with blacklisted GPUs.
+/** @defgroup nvmlExcludedGpuQueries Excluded GPU Queries
+ * This chapter describes NVML operations that are associated with excluded GPUs.
  *  @{
  */
 /***************************************************************************************************/
 
 /**
- * Blacklist GPU device information
+ * Excluded GPU device information
  **/
-typedef struct nvmlBlacklistDeviceInfo_st
+typedef struct nvmlExcludedDeviceInfo_st
 {
-    nvmlPciInfo_t pciInfo;                   //!< The PCI information for the blacklisted GPU
-    char uuid[NVML_DEVICE_UUID_BUFFER_SIZE]; //!< The ASCII string UUID for the blacklisted GPU
-} nvmlBlacklistDeviceInfo_t;
+    nvmlPciInfo_t pciInfo;                   //!< The PCI information for the excluded GPU
+    char uuid[NVML_DEVICE_UUID_BUFFER_SIZE]; //!< The ASCII string UUID for the excluded GPU
+} nvmlExcludedDeviceInfo_t;
 
  /**
- * Retrieves the number of blacklisted GPU devices in the system.
- * 
+ * Retrieves the number of excluded GPU devices in the system.
+ *
  * For all products.
  *
- * @param deviceCount                          Reference in which to return the number of blacklisted devices
- * 
- * @return 
+ * @param deviceCount                          Reference in which to return the number of excluded devices
+ *
+ * @return
  *         - \ref NVML_SUCCESS                 if \a deviceCount has been set
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a deviceCount is NULL
  */
-nvmlReturn_t DECLDIR nvmlGetBlacklistDeviceCount(unsigned int *deviceCount);
+nvmlReturn_t DECLDIR nvmlGetExcludedDeviceCount(unsigned int *deviceCount);
 
 /**
- * Acquire the device information for a blacklisted device, based on its index.
- * 
+ * Acquire the device information for an excluded GPU device, based on its index.
+ *
  * For all products.
  *
- * Valid indices are derived from the \a deviceCount returned by 
- *   \ref nvmlGetBlacklistDeviceCount(). For example, if \a deviceCount is 2 the valid indices  
+ * Valid indices are derived from the \a deviceCount returned by
+ *   \ref nvmlGetExcludedDeviceCount(). For example, if \a deviceCount is 2 the valid indices
  *   are 0 and 1, corresponding to GPU 0 and GPU 1.
  *
  * @param index                                The index of the target GPU, >= 0 and < \a deviceCount
  * @param info                                 Reference in which to return the device information
- * 
- * @return 
+ *
+ * @return
  *         - \ref NVML_SUCCESS                  if \a device has been set
  *         - \ref NVML_ERROR_INVALID_ARGUMENT   if \a index is invalid or \a info is NULL
  *
- * @see nvmlGetBlacklistDeviceCount
+ * @see nvmlGetExcludedDeviceCount
  */
-nvmlReturn_t DECLDIR nvmlGetBlacklistDeviceInfoByIndex(unsigned int index, nvmlBlacklistDeviceInfo_t *info);
+nvmlReturn_t DECLDIR nvmlGetExcludedDeviceInfoByIndex(unsigned int index, nvmlExcludedDeviceInfo_t *info);
 
 /** @} */
 
@@ -7105,14 +7336,15 @@ nvmlReturn_t DECLDIR nvmlGetBlacklistDeviceInfoByIndex(unsigned int index, nvmlB
  * These macros should be passed to \ref nvmlDeviceGetGpuInstanceProfileInfo to retrieve the
  * detailed information about a GPU instance such as profile ID, engine counts.
  */
-#define NVML_GPU_INSTANCE_PROFILE_1_SLICE 0x0
-#define NVML_GPU_INSTANCE_PROFILE_2_SLICE 0x1
-#define NVML_GPU_INSTANCE_PROFILE_3_SLICE 0x2
-#define NVML_GPU_INSTANCE_PROFILE_4_SLICE 0x3
-#define NVML_GPU_INSTANCE_PROFILE_7_SLICE 0x4
-#define NVML_GPU_INSTANCE_PROFILE_8_SLICE 0x5
-#define NVML_GPU_INSTANCE_PROFILE_6_SLICE 0x6
-#define NVML_GPU_INSTANCE_PROFILE_COUNT   0x7
+#define NVML_GPU_INSTANCE_PROFILE_1_SLICE      0x0
+#define NVML_GPU_INSTANCE_PROFILE_2_SLICE      0x1
+#define NVML_GPU_INSTANCE_PROFILE_3_SLICE      0x2
+#define NVML_GPU_INSTANCE_PROFILE_4_SLICE      0x3
+#define NVML_GPU_INSTANCE_PROFILE_7_SLICE      0x4
+#define NVML_GPU_INSTANCE_PROFILE_8_SLICE      0x5
+#define NVML_GPU_INSTANCE_PROFILE_6_SLICE      0x6
+#define NVML_GPU_INSTANCE_PROFILE_1_SLICE_REV1 0x7
+#define NVML_GPU_INSTANCE_PROFILE_COUNT        0x8
 
 typedef struct nvmlGpuInstancePlacement_st
 {
@@ -7285,21 +7517,21 @@ nvmlReturn_t DECLDIR nvmlDeviceGetGpuInstanceProfileInfo(nvmlDevice_t device, un
  *
  * @param device                               The identifier of the target device
  * @param profileId                            The GPU instance profile ID. See \ref nvmlDeviceGetGpuInstanceProfileInfo
- * @param placements                           Returns placements, the buffer must be large enough to accommodate
- *                                             the instances supported by the profile.
- *                                             See \ref nvmlDeviceGetGpuInstanceProfileInfo
- * @param count                                The count of returned placements
+ * @param placements                           Returns placements allowed for the profile. Can be NULL to discover number
+ *                                             of allowed placements for this profile. If non-NULL must be large enough
+ *                                             to accommodate the placements supported by the profile.
+ * @param count                                Returns number of allowed placemenets for the profile.
  *
  * @return
  *         - \ref NVML_SUCCESS                 Upon success
  *         - \ref NVML_ERROR_UNINITIALIZED     If library has not been successfully initialized
- *         - \ref NVML_ERROR_INVALID_ARGUMENT  If \a device, \a profileId, \a placements or \a count are invalid
+ *         - \ref NVML_ERROR_INVALID_ARGUMENT  If \a device, \a profileId or \a count are invalid
  *         - \ref NVML_ERROR_NOT_SUPPORTED     If \a device doesn't have MIG mode enabled or \a profileId isn't supported
  *         - \ref NVML_ERROR_NO_PERMISSION     If user doesn't have permission to perform the operation
  */
-nvmlReturn_t DECLDIR nvmlDeviceGetGpuInstancePossiblePlacements(nvmlDevice_t device, unsigned int profileId,
-                                                                nvmlGpuInstancePlacement_t *placements,
-                                                                unsigned int *count);
+nvmlReturn_t DECLDIR nvmlDeviceGetGpuInstancePossiblePlacements_v2(nvmlDevice_t device, unsigned int profileId,
+                                                                   nvmlGpuInstancePlacement_t *placements,
+                                                                   unsigned int *count);
 
 /**
  * Get GPU instance profile capacity.
@@ -7359,7 +7591,7 @@ nvmlReturn_t DECLDIR nvmlDeviceCreateGpuInstance(nvmlDevice_t device, unsigned i
  *
  * @param device                               The identifier of the target device
  * @param profileId                            The GPU instance profile ID. See \ref nvmlDeviceGetGpuInstanceProfileInfo
- * @param placement                            The requested placement. See \ref nvmlDeviceGetGpuInstancePossiblePlacements
+ * @param placement                            The requested placement. See \ref nvmlDeviceGetGpuInstancePossiblePlacements_v2
  * @param gpuInstance                          Returns the GPU instance handle
  *
  * @return
@@ -7759,12 +7991,15 @@ nvmlReturn_t DECLDIR nvmlDeviceGetPciInfo_v2(nvmlDevice_t device, nvmlPciInfo_t
 nvmlReturn_t DECLDIR nvmlDeviceGetNvLinkRemotePciInfo(nvmlDevice_t device, unsigned int link, nvmlPciInfo_t *pci);
 nvmlReturn_t DECLDIR nvmlDeviceGetGridLicensableFeatures(nvmlDevice_t device, nvmlGridLicensableFeatures_t *pGridLicensableFeatures);
 nvmlReturn_t DECLDIR nvmlDeviceGetGridLicensableFeatures_v2(nvmlDevice_t device, nvmlGridLicensableFeatures_t *pGridLicensableFeatures);
+nvmlReturn_t DECLDIR nvmlDeviceGetGridLicensableFeatures_v3(nvmlDevice_t device, nvmlGridLicensableFeatures_t *pGridLicensableFeatures);
 nvmlReturn_t DECLDIR nvmlDeviceRemoveGpu(nvmlPciInfo_t *pciInfo);
 nvmlReturn_t DECLDIR nvmlEventSetWait(nvmlEventSet_t set, nvmlEventData_t * data, unsigned int timeoutms);
 nvmlReturn_t DECLDIR nvmlDeviceGetAttributes(nvmlDevice_t device, nvmlDeviceAttributes_t *attributes);
 nvmlReturn_t DECLDIR nvmlComputeInstanceGetInfo(nvmlComputeInstance_t computeInstance, nvmlComputeInstanceInfo_t *info);
-nvmlReturn_t DECLDIR nvmlDeviceGetComputeRunningProcesses(nvmlDevice_t device, unsigned int *infoCount, nvmlProcessInfo_t *infos);
-nvmlReturn_t DECLDIR nvmlDeviceGetGraphicsRunningProcesses(nvmlDevice_t device, unsigned int *infoCount, nvmlProcessInfo_t *infos);
+nvmlReturn_t DECLDIR nvmlDeviceGetComputeRunningProcesses(nvmlDevice_t device, unsigned int *infoCount, nvmlProcessInfo_v1_t *infos);
+nvmlReturn_t DECLDIR nvmlDeviceGetGraphicsRunningProcesses(nvmlDevice_t device, unsigned int *infoCount, nvmlProcessInfo_v1_t *infos);
+nvmlReturn_t DECLDIR nvmlDeviceGetMPSComputeRunningProcesses(nvmlDevice_t device, unsigned int *infoCount, nvmlProcessInfo_v1_t *infos);
+nvmlReturn_t DECLDIR nvmlDeviceGetGpuInstancePossiblePlacements(nvmlDevice_t device, unsigned int profileId, nvmlGpuInstancePlacement_t *placements, unsigned int *count);
 #endif // #ifdef NVML_NO_UNVERSIONED_FUNC_DEFS
 
 #if defined(NVML_NO_UNVERSIONED_FUNC_DEFS)
@@ -7773,6 +8008,7 @@ nvmlReturn_t DECLDIR nvmlDeviceGetGraphicsRunningProcesses(nvmlDevice_t device,
 #elif defined(__NVML_API_VERSION_INTERNAL)
 #undef nvmlDeviceGetGraphicsRunningProcesses
 #undef nvmlDeviceGetComputeRunningProcesses
+#undef nvmlDeviceGetMPSComputeRunningProcesses
 #undef nvmlDeviceGetAttributes
 #undef nvmlComputeInstanceGetInfo
 #undef nvmlEventSetWait
@@ -7784,6 +8020,10 @@ nvmlReturn_t DECLDIR nvmlDeviceGetGraphicsRunningProcesses(nvmlDevice_t device,
 #undef nvmlDeviceGetHandleByIndex
 #undef nvmlDeviceGetHandleByPciBusId
 #undef nvmlInit
+#undef nvmlBlacklistDeviceInfo_t
+#undef nvmlGetBlacklistDeviceCount
+#undef nvmlGetBlacklistDeviceInfoByIndex
+#undef nvmlDeviceGetGpuInstancePossiblePlacements
 #endif
 
 #ifdef __cplusplus
diff --git a/src/parse.c b/src/parse.c
index 7f5d51e5eaff6f05237ec3d2d4b12865f4abf39d..ab7d0740bf6a3897c4c94a5261c1873a535779ca 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -17,7 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses>.
  */
 
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
@@ -128,9 +127,9 @@ const AttributeTableEntry attributeTable[] = {
     { "SliMosaicModeAvailable",           NV_CTRL_SLI_MOSAIC_MODE_AVAILABLE,            INT_ATTR, {0,0,0,1,0}, { .int_flags = {0,0,0,0,0,0,0} }, "Returns whether or not SLI Mosaic Mode is supported." },
     { "SLIMode",                          NV_CTRL_STRING_SLI_MODE,                      STR_ATTR, {0,0,0,1,0}, {}, "Returns a string describing the current SLI mode, if any." },
     { "MultiGpuMode",                     NV_CTRL_STRING_MULTIGPU_MODE,                 STR_ATTR, {0,0,0,1,0}, {}, "Returns a string describing the current MultiGPU mode, if any." },
-    { "AllowGSYNC",                       NV_CTRL_GSYNC_ALLOWED,                        INT_ATTR, {0,0,0,0,0}, { .int_flags = {0,0,0,0,0,0,0} }, "DEPRECATED: use \"AllowVRR\" instead." },
+    { "AllowGSYNC",                       NV_CTRL_VRR_ALLOWED,                          INT_ATTR, {0,0,0,0,0}, { .int_flags = {0,0,0,0,0,0,0} }, "DEPRECATED: use \"AllowVRR\" instead." },
     { "AllowVRR",                         NV_CTRL_VRR_ALLOWED,                          INT_ATTR, {0,0,0,0,0}, { .int_flags = {0,0,0,0,0,0,0} }, "Enables or disables the use of G-SYNC and G-SYNC Compatible when available." },
-    { "ShowGSYNCVisualIndicator",         NV_CTRL_SHOW_GSYNC_VISUAL_INDICATOR,          INT_ATTR, {0,0,0,0,0}, { .int_flags = {0,0,0,0,0,0,0} }, "DEPRECATED: use \"ShowVRRVisualIndicator\" instead." },
+    { "ShowGSYNCVisualIndicator",         NV_CTRL_SHOW_VRR_VISUAL_INDICATOR,            INT_ATTR, {0,0,0,0,0}, { .int_flags = {0,0,0,0,0,0,0} }, "DEPRECATED: use \"ShowVRRVisualIndicator\" instead." },
     { "ShowVRRVisualIndicator",           NV_CTRL_SHOW_VRR_VISUAL_INDICATOR,            INT_ATTR, {0,0,0,0,0}, { .int_flags = {0,0,0,0,0,0,0} }, "If this is enabled (1), the driver will draw an indicator showing whether G-SYNC or G-SYNC Compatible is in use, when an application is swapping using flipping." },
     { "StereoSwapMode",                   NV_CTRL_STEREO_SWAP_MODE,                     INT_ATTR, {0,0,0,0,0}, { .int_flags = {0,0,0,0,0,0,0} }, "Controls the swap mode when Quad-Buffered stereo is used." },
     { "ShowGraphicsVisualIndicator",      NV_CTRL_SHOW_GRAPHICS_VISUAL_INDICATOR,       INT_ATTR, {0,0,0,0,0}, { .int_flags = {0,0,0,0,0,0,0} }, "If this is enabled (1), the driver will draw information about the graphics API in use into a \"visual indicator\" inside application windows.  This setting only takes effect on clients started after it is set." },
diff --git a/src/query-assign.c b/src/query-assign.c
index ee3b24ccb562e6b1f4922083c813dc9822c2135f..bd3eededb0573ffe5178f9992402eae0adc8b550 100644
--- a/src/query-assign.c
+++ b/src/query-assign.c
@@ -1957,6 +1957,19 @@ static int process_parsed_attribute_internal(const Options *op,
     if (assign) {
         if (a->type == CTRL_ATTRIBUTE_TYPE_STRING) {
             status = NvCtrlSetStringAttribute(t, a->attr, p->val.str);
+
+            if (status != NvCtrlSuccess) {
+                nv_error_msg("Error assigning value %s to attribute '%s' "
+                             "(%s%s) as specified %s (%s).",
+                             p->val.str, a->name, t->name, str, whence,
+                             NvCtrlAttributesStrError(status));
+                return NV_FALSE;
+            }
+
+            if (verbose) {
+                 nv_msg("  ", "Attribute '%s' (%s%s) assigned value '%s'.",
+                 a->name, t->name, str, p->val.str);
+            }
         } else {
 
             ret = validate_value(op, t, p, d, target_type, whence);
diff --git a/src/version.mk b/src/version.mk
index 634141a6768f9b92afa7bf08936c52df0d0dece6..d801b09105e1cde46aeee40707e160b4213bfadc 100644
--- a/src/version.mk
+++ b/src/version.mk
@@ -1,4 +1,4 @@
-NVIDIA_VERSION = 460.91.03
+NVIDIA_VERSION = 470.94
 
 # This file.
 VERSION_MK_FILE := $(lastword $(MAKEFILE_LIST))
diff --git a/utils.mk b/utils.mk
index af0e3d77e7109b63ec1e75ee327930211f9d10f8..e5ac3a2886d35c6cc5ce1abbf0a7ac1224e0d1c8 100644
--- a/utils.mk
+++ b/utils.mk
@@ -33,10 +33,11 @@
 ##############################################################################
 
 CC                    ?= gcc
+CXX                   ?= g++
 LD                    ?= ld
 AR                    ?= ar
-# only set these warnings and optimizations if CFLAGS is unset
-CFLAGS                ?= -Wall -O2
+# only set these warnings if CFLAGS is unset
+CFLAGS                ?= -Wall
 # always set these -f CFLAGS
 CFLAGS                += -fno-strict-aliasing -fno-omit-frame-pointer -Wformat=2
 CC_ONLY_CFLAGS        ?=
@@ -58,16 +59,27 @@ CFLAGS                += -Wno-unused-parameter
 HOST_CC_ONLY_CFLAGS   += -Wno-format-zero-length
 HOST_CFLAGS           += -Wno-unused-parameter
 
+DEBUG                 ?=
+DEVELOP               ?=
+
 ifeq ($(DEBUG),1)
   STRIP_CMD           ?= true
   DO_STRIP            ?=
   CFLAGS              += -O0 -g
   CFLAGS              += -DDEBUG=1
 else
-  STRIP_CMD           ?= strip
-  DO_STRIP            ?= 1
+  CFLAGS              += -O2
 endif
 
+ifeq ($(DEVELOP),1)
+  STRIP_CMD           ?= true
+  DO_STRIP            ?=
+  CFLAGS              += -DDEVELOP=1
+endif
+
+STRIP_CMD             ?= strip
+DO_STRIP              ?= 1
+
 INSTALL               ?= install
 INSTALL_BIN_ARGS      ?= -m 755
 INSTALL_LIB_ARGS      ?= -m 644
@@ -185,6 +197,21 @@ ifneq ($(_eval_available),T)
 endif
 
 
+##############################################################################
+# Test passing $(1) to $(CC).  If $(CC) succeeds, then echo $(1).
+#
+# Because this uses $(shell), it is best to use this to assign simply expanded
+# variables (e.g., ":=").
+#
+# Example usage:
+#  CONDITIONAL_CFLAGS := $(call TEST_CC_ARG, -ffoo)
+##############################################################################
+
+TEST_CC_ARG = \
+ $(shell $(CC) -c -x c /dev/null $(1) -o /dev/null > /dev/null 2>&1 && \
+   $(ECHO) $(1))
+
+
 ##############################################################################
 # define variables used when installing the open source utilities from
 # the source tarball
@@ -276,7 +303,7 @@ host_target = $(patsubst HOST,HOST_,$(patsubst TARGET,,$(1)))
 
 ifeq ($(NV_AUTO_DEPEND),1)
   AUTO_DEP_SUFFIX = -MMD -MF $$(@:.o=.d.to_be_processed) -MP -MT $$@ && \
-    $$(SED) -e "1,3s@ $$< @ @" < $$(@:.o=.d.to_be_processed) > $$(@:.o=.d)
+    $$(SED) -e "1,3s| $$< | |" < $$(@:.o=.d.to_be_processed) > $$(@:.o=.d)
 else
   AUTO_DEP_SUFFIX =
 endif
@@ -486,8 +513,9 @@ endif
 define GENERATE_NVIDSTRING
   # g_nvid_string.c depends on all objects except g_nvid_string.o, and version.mk
   $(NVIDSTRING): $$(filter-out $$(call BUILD_OBJECT_LIST,$$(NVIDSTRING)), $(3)) $$(VERSION_MK)
-	@$$(ECHO) "const char $(1)[] = \"nvidia id: NVIDIA $$(strip $(2)) for $$(TARGET_ARCH)  $$(NVIDIA_VERSION)  $$(NVIDSTRING_BUILD_TYPE_STRING)  (`$$(WHOAMI)`@`$$(HOSTNAME)`)  `$$(DATE)`\";" > $$@
-	@$$(ECHO) "const char *const p$$(strip $(1)) = $(1) + 11;" >> $$@;
+	$(at_if_quiet)$$(MKDIR) $$(dir $$@)
+	$(at_if_quiet)$$(ECHO) "const char $(1)[] = \"nvidia id: NVIDIA $$(strip $(2)) for $$(TARGET_ARCH)  $$(NVIDIA_VERSION)  $$(NVIDSTRING_BUILD_TYPE_STRING)  (`$$(WHOAMI)`@`$$(HOSTNAME)`)  `$$(DATE)`\";" > $$@
+	$(at_if_quiet)$$(ECHO) "const char *const p$$(strip $(1)) = $(1) + 11;" >> $$@;
 endef
 
 
@@ -510,6 +538,7 @@ endef
 
 define READ_ONLY_OBJECT_FROM_FILE_RULE
   $$(OUTPUTDIR)/$$(notdir $(1)).o: $(1)
+	$(at_if_quiet)$$(MKDIR) $$(OUTPUTDIR)
 	$(at_if_quiet)cd $$(dir $(1)); \
 	$$(call quiet_cmd_no_at,LD) -r -z noexecstack --format=binary \
 	    $$(notdir $(1)) -o $$(OUTPUTDIR_ABSOLUTE)/$$(notdir $$@)
diff --git a/version.mk b/version.mk
index 634141a6768f9b92afa7bf08936c52df0d0dece6..d801b09105e1cde46aeee40707e160b4213bfadc 100644
--- a/version.mk
+++ b/version.mk
@@ -1,4 +1,4 @@
-NVIDIA_VERSION = 460.91.03
+NVIDIA_VERSION = 470.94
 
 # This file.
 VERSION_MK_FILE := $(lastword $(MAKEFILE_LIST))