410.66

8 files changed, 52 insertions, 6 deletions

diff --git a/doc/version.mk b/doc/version.mk
index 37ee6b6..16b4150 100644
--- a/doc/version.mk
+++ b/doc/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 410.57
+NVIDIA_VERSION = 410.66
diff --git a/samples/version.mk b/samples/version.mk
index 37ee6b6..16b4150 100644
--- a/samples/version.mk
+++ b/samples/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 410.57
+NVIDIA_VERSION = 410.66
diff --git a/src/gtk+-2.x/ctkdisplayconfig.c b/src/gtk+-2.x/ctkdisplayconfig.c
index 0af47f7..571574b 100644
--- a/src/gtk+-2.x/ctkdisplayconfig.c
+++ b/src/gtk+-2.x/ctkdisplayconfig.c
@@ -323,6 +323,19 @@ static const char * __screen_metamode_delete_button_help =
 "MetaMode for the screen;  This option can be applied to your currently "
 "running X server.";
 
+/* Prime Display tooltips */
+
+static const char *__prime_viewport_help =
+"This shows the width, height, and offset in pixels of the region that "
+"should be displayed from the desktop.";
+
+static const char *__prime_name_help =
+"This is the name of the display.";
+
+static const char *__prime_sync_help =
+"This shows the status of synchronization for the PRIME display. Without "
+"synchronization, applications will not be able to sync to the display's "
+"vblank.";
 
 /* General button tooltips */
 
@@ -2234,6 +2247,8 @@ GtkWidget* ctk_display_config_new(CtrlTarget *ctrl_target,
         gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
 
         ctk_object->lbl_prime_display_view = gtk_label_new("");
+        ctk_config_set_tooltip(ctk_config, ctk_object->lbl_prime_display_view,
+                               __prime_viewport_help);
         gtk_box_pack_start(GTK_BOX(hbox),
                            ctk_object->lbl_prime_display_view,
                            FALSE, FALSE, 5);
@@ -2245,6 +2260,8 @@ GtkWidget* ctk_display_config_new(CtrlTarget *ctrl_target,
         labels = g_slist_append(labels, label);
         gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
         ctk_object->lbl_prime_display_name = gtk_label_new("");
+        ctk_config_set_tooltip(ctk_config, ctk_object->lbl_prime_display_name,
+                               __prime_name_help);
         gtk_box_pack_start(GTK_BOX(hbox),
                            ctk_object->lbl_prime_display_name,
                            FALSE, FALSE, 5);
@@ -2257,6 +2274,8 @@ GtkWidget* ctk_display_config_new(CtrlTarget *ctrl_target,
         labels = g_slist_append(labels, label);
         gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
         ctk_object->lbl_prime_display_sync = gtk_label_new("");
+        ctk_config_set_tooltip(ctk_config, ctk_object->lbl_prime_display_sync,
+                               __prime_sync_help);
         gtk_box_pack_start(GTK_BOX(hbox),
                            ctk_object->lbl_prime_display_sync,
                            FALSE, FALSE, 5);
@@ -2516,6 +2535,21 @@ GtkTextBuffer *ctk_display_config_create_help(GtkTextTagTable *table,
 
 
     ctk_help_para(b, &i, "");
+    ctk_help_heading(b, &i, "PRIME Display Options");
+    ctk_help_para(b, &i, "The following attributes are available when a "
+                  "configured PRIME display is selected in the Selection "
+                  "drop-down. These attributes cannot be changed within "
+                  "nvidia-settings.");
+    ctk_help_heading(b, &i, "Viewport");
+    ctk_help_para(b, &i, "%s", __prime_viewport_help);
+    ctk_help_heading(b, &i, "Name");
+    ctk_help_para(b, &i, "%s  This attribute may not be available.",
+                  __prime_name_help);
+    ctk_help_heading(b, &i, "Synchronization");
+    ctk_help_para(b, &i, "%s", __prime_sync_help);
+
+
+    ctk_help_para(b, &i, "");
     ctk_help_heading(b, &i, "Buttons");
     ctk_help_heading(b, &i, "Apply");
     ctk_help_para(b, &i, "%s  Note that not all settings can be applied to an "
diff --git a/src/libXNVCtrl/version.mk b/src/libXNVCtrl/version.mk
index 37ee6b6..16b4150 100644
--- a/src/libXNVCtrl/version.mk
+++ b/src/libXNVCtrl/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 410.57
+NVIDIA_VERSION = 410.66
diff --git a/src/libXNVCtrlAttributes/NvCtrlAttributesNvml.c b/src/libXNVCtrlAttributes/NvCtrlAttributesNvml.c
index 5eb40d2..63db318 100644
--- a/src/libXNVCtrlAttributes/NvCtrlAttributesNvml.c
+++ b/src/libXNVCtrlAttributes/NvCtrlAttributesNvml.c
@@ -321,6 +321,7 @@ NvCtrlNvmlAttributes *NvCtrlInitNvmlAttributes(NvCtrlAttributePrivateHandle *h)
     unsigned int count;
     unsigned int *nvctrlToNvmlId;
     int i;
+    int nvctrlCoolerCount;
 
     /* Check parameters */
     if (h == NULL || !TARGET_TYPE_IS_NVML_COMPATIBLE(h->target_type)) {
@@ -405,6 +406,17 @@ NvCtrlNvmlAttributes *NvCtrlInitNvmlAttributes(NvCtrlAttributePrivateHandle *h)
         }
     }
 
+    /*
+     * NVML doesn't have support to handle more than 1 fan per GPU. Make sure
+     * total number of cooler probed by NVML are same as that of reported by
+     * NV-CONTROL, otherwise do not initialize NVML sub-system.
+     */
+    if (!XNVCTRLQueryTargetCount(h->dpy, NV_CTRL_TARGET_TYPE_COOLER,
+                                 &nvctrlCoolerCount) ||
+        (nvctrlCoolerCount != nvml->coolerCount)) {
+        goto fail;
+    }
+
     nvfree(nvctrlToNvmlId);
 
     return nvml;
diff --git a/src/version.h b/src/version.h
index 29693a7..2426348 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define NVIDIA_VERSION "410.57"
+#define NVIDIA_VERSION "410.66"
diff --git a/src/version.mk b/src/version.mk
index 37ee6b6..16b4150 100644
--- a/src/version.mk
+++ b/src/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 410.57
+NVIDIA_VERSION = 410.66
diff --git a/version.mk b/version.mk
index 37ee6b6..16b4150 100644
--- a/version.mk
+++ b/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 410.57
+NVIDIA_VERSION = 410.66