331.38331.38

11 files changed, 55 insertions, 21 deletions

diff --git a/doc/nvidia-settings.1.m4 b/doc/nvidia-settings.1.m4
index 9dc44a2..6bdd997 100644
--- a/doc/nvidia-settings.1.m4
+++ b/doc/nvidia-settings.1.m4
@@ -242,7 +242,7 @@ If no X screen is specified, then the attribute value will be queried for all va
 .PP
 Attributes can be addressed through "target types".
 A target type indicates the object that is queried when you query an attribute.
-The default target type is an X screen, but other possible target types are GPUs, Frame Lock devices, Visual Computing Systems, SDI Input Devices, and fans.
+The default target type is an X screen, but other possible target types are GPUs, Frame Lock devices, Visual Computing Systems, SDI Input Devices, fans, thermal sensors, 3D Vision Pro Transceivers and display devices.
 .PP
 Target types give you different granularities with which to perform queries and assignments.
 Since X screens can span multiple GPUs (in the case of Xinerama, or SLI), and multiple X screens can exist on the same GPU, it is sometimes useful to address attributes by GPU rather than X screen.
@@ -339,7 +339,7 @@ for what targets types can be used with each attribute.
 See the output of
 .nf
 
-        nvidia\-settings \-\-query screens \-\-query gpus \-\-query framelocks \-\-query vcs \-\-query gvis \-\-query fans
+        nvidia\-settings \-\-query screens \-\-query gpus \-\-query framelocks \-\-query vcs \-\-query gvis \-\-query fans \-\-query thermalsensors \-\-query svps \-\-query dpys
 
 .fi
 for lists of targets for each target type.
diff --git a/doc/version.mk b/doc/version.mk
index 0d4860a..2bca142 100644
--- a/doc/version.mk
+++ b/doc/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 331.20
+NVIDIA_VERSION = 331.38
diff --git a/samples/version.mk b/samples/version.mk
index 0d4860a..2bca142 100644
--- a/samples/version.mk
+++ b/samples/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 331.20
+NVIDIA_VERSION = 331.38
diff --git a/src/gtk+-2.x/ctkevent.c b/src/gtk+-2.x/ctkevent.c
index a8497dc..a8b2db1 100644
--- a/src/gtk+-2.x/ctkevent.c
+++ b/src/gtk+-2.x/ctkevent.c
@@ -330,6 +330,8 @@ static void ctk_event_class_init(CtkEventClass *ctk_event_class)
     MAKE_SIGNAL(NV_CTRL_GPU_POWER_MIZER_DEFAULT_MODE);
     MAKE_SIGNAL(NV_CTRL_XV_SYNC_TO_DISPLAY_ID);
     MAKE_SIGNAL(NV_CTRL_BACKLIGHT_BRIGHTNESS);
+    MAKE_SIGNAL(NV_CTRL_GPU_LOGO_BRIGHTNESS);
+    MAKE_SIGNAL(NV_CTRL_GPU_SLI_LOGO_BRIGHTNESS);
     MAKE_SIGNAL(NV_CTRL_THERMAL_COOLER_SPEED);
 #undef MAKE_SIGNAL
 
diff --git a/src/libXNVCtrl/NVCtrl.h b/src/libXNVCtrl/NVCtrl.h
index e50dd98..9fa995c 100644
--- a/src/libXNVCtrl/NVCtrl.h
+++ b/src/libXNVCtrl/NVCtrl.h
@@ -3298,6 +3298,18 @@
 #define NV_CTRL_BACKLIGHT_BRIGHTNESS                            402 /* RWD- */
 
 /*
+ * NV_CTRL_GPU_LOGO_BRIGHTNESS - Controls brightness
+ * of the logo on the GPU, if any.  The value is variable from 0% - 100%.
+ */ 
+#define NV_CTRL_GPU_LOGO_BRIGHTNESS                             403 /* RW-G */
+
+/*
+ * NV_CTRL_GPU_SLI_LOGO_BRIGHTNESS - Controls brightness of the logo
+ * on the SLI bridge, if any.  The value is variable from 0% - 100%.
+ */  
+#define NV_CTRL_GPU_SLI_LOGO_BRIGHTNESS                         404 /* RW-G */
+
+/*
  * NV_CTRL_THERMAL_COOLER_SPEED - Returns cooler's current operating speed in
  * rotations per minute (RPM).
  */
diff --git a/src/option-table.h b/src/option-table.h
index 02c7ee6..a5feea6 100644
--- a/src/option-table.h
+++ b/src/option-table.h
@@ -93,11 +93,12 @@ static const NVGetoptOption __options[] = {
       "an assignment to something other than an X screen.  A target "
       "specification is contained within brackets and consists of a target "
       "type name, a colon, and the target id.  The target type name can be "
-      "one of ^\"screen\", \"gpu\", \"framelock\", \"vcs\", \"gvi\",^ or "
-      "^\"fan\";^ the target id is the index into the list of targets "
-      "(for that target type).  The target specification can be used in "
-      "{DISPLAY} wherever an X screen can be used, following the syntax "
-      "{host}:{display}[{target_type}:{target_id}].  See the output of\n"
+      "one of ^\"screen\", \"gpu\", \"framelock\", \"vcs\", \"gvi\", \"fan\", "
+      "\"thermalsensor\", \"svp\",^ or ^\"dpy\";^ the target id is the index "
+      "into the list of targets (for that target type).  The target "
+      "specification can be used in {DISPLAY} wherever an X screen can be used, "
+      "following the syntax {host}:{display}[{target_type}:{target_id}].  See "
+      "the output of\n"
       "\n"
       TAB "nvidia-settings -q all \n"
       "\n"
@@ -105,7 +106,7 @@ static const NVGetoptOption __options[] = {
       "attributes.  See the output of\n"
       "\n"
       TAB " nvidia-settings -q screens -q gpus -q framelocks -q vcs -q gvis "
-      "-q fans \n"
+      "-q fans -q thermalsensors -q svps -q dpys \n"
       "\n"
       "for lists of targets for each target type.\n"
       "\n"
@@ -128,10 +129,12 @@ static const NVGetoptOption __options[] = {
       "This queries the current value of the attribute {attribute name} on the "
       "X Display {DISPLAY}.  The syntax is the same as that for the "
       "^'--assign'^ option, without '=^{value}'^; specify ^'-q screens', "
-      "'-q gpus', '-q framelocks', '-q vcs', '-q gvis', or '-q fans'^ to "
-      "query a list of X screens, GPUs, Frame Lock devices, Visual Computing "
-      "Systems, SDI Input Devices, or Fans, respectively, that are present "
-      "on the X Display {DISPLAY}.  Specify ^'-q all'^ to query all attributes." },
+      "'-q gpus', '-q framelocks', '-q vcs', '-q gvis', '-q fans'^, "
+      "'-q thermalsensors', '-q svps', or '-q dpys' to query a list of X "
+      "screens, GPUs, Frame Lock devices, Visual Computing Systems, SDI Input "
+      "Devices, Fans, Thermal Sensors, 3D Vision Pro Transceivers, or Display "
+      "Devices, respectively, that are present on the X Display {DISPLAY}.  "
+      "Specify ^'-q all'^ to query all attributes." },
 
     { "terse", 't', NVGETOPT_HELP_ALWAYS, NULL,
       "When querying attribute values with the '--query' command line option, "
diff --git a/src/parse.c b/src/parse.c
index 6dc9b4b..0433ffe 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -171,6 +171,8 @@ const AttributeTableEntry attributeTable[] = {
     { "GPUPowerMizerDefaultMode", NV_CTRL_GPU_POWER_MIZER_DEFAULT_MODE, N,  "Reports the default powermizer mode of the GPU, if any." },
     { "ECCSupported",           NV_CTRL_GPU_ECC_SUPPORTED,             N,   "Reports whether the underlying GPU supports ECC.  All of the other ECC attributes are only applicable if this attribute indicates that ECC is supported." },
     { "ECCStatus",              NV_CTRL_GPU_ECC_STATUS,                N,   "Reports whether ECC is enabled." },
+    { "GPULogoBrightness",      NV_CTRL_GPU_LOGO_BRIGHTNESS,           0,   "Controls brightness of the logo on the GPU, if any.  The value is variable from 0% - 100%." },
+    { "GPUSLIBridgeLogoBrightness", NV_CTRL_GPU_SLI_LOGO_BRIGHTNESS,   0,   "Controls brightness of the logo on the SLI bridge, if any.  The value is variable from 0% - 100%." },
     { "ECCConfigurationSupported", NV_CTRL_GPU_ECC_CONFIGURATION_SUPPORTED, N,   "Reports whether ECC whether the ECC configuration setting can be changed." },
     { "ECCConfiguration",            NV_CTRL_GPU_ECC_CONFIGURATION,               N, "Returns the current ECC configuration setting." },
     { "ECCDefaultConfiguration",     NV_CTRL_GPU_ECC_DEFAULT_CONFIGURATION,       N, "Returns the default ECC configuration setting." },
@@ -812,6 +814,7 @@ int nv_parse_attribute_string(const char *str, int query, ParsedAttribute *a)
             a->name = t->name;
             a->attr = t->attr;
             a->flags |= t->flags;
+            a->attr_entry = t;
             break;
         }
     }
diff --git a/src/parse.h b/src/parse.h
index 5ae7baa..117c7f4 100644
--- a/src/parse.h
+++ b/src/parse.h
@@ -128,6 +128,7 @@ typedef struct _ParsedAttribute {
     int target_id;
     char *target_name;
     int attr;
+    const AttributeTableEntry *attr_entry;
     union {
         int i;
         float f;
diff --git a/src/query-assign.c b/src/query-assign.c
index ea25bae..8b5ec37 100644
--- a/src/query-assign.c
+++ b/src/query-assign.c
@@ -1514,11 +1514,11 @@ static int resolve_attribute_targets(ParsedAttribute *a, CtrlHandles *h,
 
             /* Warn that this usage is deprecated */
 
-            nv_warning_msg("Display mask usage as specified %s has been "
-                           "deprecated and will be removed in the future."
-                           "Please use display names and/or display target "
-                           "specification instead.",
-                           whence);
+            nv_deprecated_msg("Display mask usage as specified %s has been "
+                              "deprecated and will be removed in the future."
+                              "Please use display names and/or display target "
+                              "specification instead.",
+                              whence);
         } else {
             display_mask = VALID_DISPLAY_DEVICES_MASK;
         }
@@ -2924,6 +2924,19 @@ int nv_process_parsed_attribute(ParsedAttribute *a, CtrlHandles *h,
         goto done;
     }
 
+    /* Print deprecation messages */
+    if (strncmp(a->attr_entry->desc, "DEPRECATED", 10) == 0) {
+        const char *str = a->attr_entry->desc + 10;
+        while (*str &&
+               (*str == ':' || *str == '.')) {
+            str++;
+        }
+        nv_deprecated_msg("The attribute '%s' is deprecated%s%s",
+                          a->name,
+                          *str ? "," : ".",
+                          *str ? str : "");
+    }
+
     /* Resolve any target specifications against the CtrlHandles that were
      * allocated.
      */
diff --git a/src/version.mk b/src/version.mk
index 0d4860a..2bca142 100644
--- a/src/version.mk
+++ b/src/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 331.20
+NVIDIA_VERSION = 331.38
diff --git a/version.mk b/version.mk
index 0d4860a..2bca142 100644
--- a/version.mk
+++ b/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 331.20
+NVIDIA_VERSION = 331.38