418.43

10 files changed, 55 insertions, 9 deletions

diff --git a/doc/version.mk b/doc/version.mk
index fa0f583..33d731b 100644
--- a/doc/version.mk
+++ b/doc/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 418.30
+NVIDIA_VERSION = 418.43
diff --git a/samples/version.mk b/samples/version.mk
index fa0f583..33d731b 100644
--- a/samples/version.mk
+++ b/samples/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 418.30
+NVIDIA_VERSION = 418.43
diff --git a/src/gtk+-2.x/ctkdisplaydevice.c b/src/gtk+-2.x/ctkdisplaydevice.c
index 2b32188..1d14402 100644
--- a/src/gtk+-2.x/ctkdisplaydevice.c
+++ b/src/gtk+-2.x/ctkdisplaydevice.c
@@ -65,6 +65,7 @@ static gboolean update_connector_type_info(InfoEntry *entry);
 static gboolean update_multistream_info(InfoEntry *entry);
 static gboolean update_audio_info(InfoEntry *entry);
 static gboolean update_vrr_type_info(InfoEntry *entry);
+static gboolean update_vrr_enabled_info(InfoEntry *entry);
 
 static gboolean register_link_events(InfoEntry *entry);
 static gboolean unregister_link_events(InfoEntry *entry);
@@ -120,6 +121,13 @@ static const char * __vrr_type_help =
 "Report whether the configured display supports G-SYNC, G-SYNC Compatible, or "
 "neither.";
 
+static const char * __vrr_enabled_help =
+"Report whether the configured display enabled variable refresh mode at "
+"modeset time.  On displays capable of variable refresh mode but which are not "
+"validated as G-SYNC compatible, variable refresh mode can be enabled on the X "
+"Server Display Configuration page, or by using the AllowGSYNCCompatible "
+"MetaMode attribute.";
+
 typedef gboolean (*InfoEntryFunc)(InfoEntry *entry);
 
 typedef struct {
@@ -201,6 +209,13 @@ static InfoEntryData __info_entry_data[] = {
         NULL,
         NULL,
     },
+    {
+        "G-SYNC Mode Enabled",
+        &__vrr_enabled_help,
+        update_vrr_enabled_info,
+        NULL,
+        NULL,
+    },
 };
 
 GType ctk_display_device_get_type(void)
@@ -884,6 +899,24 @@ static gboolean update_vrr_type_info(InfoEntry *entry)
     return TRUE;
 }
 
+static gboolean update_vrr_enabled_info(InfoEntry *entry)
+{
+    CtkDisplayDevice *ctk_object = entry->ctk_object;
+    CtrlTarget *ctrl_target = ctk_object->ctrl_target;
+    ReturnStatus ret;
+    gint val;
+
+    ret = NvCtrlGetAttribute(ctrl_target,
+                             NV_CTRL_DISPLAY_VRR_ENABLED, &val);
+    if (ret != NvCtrlSuccess) {
+        return FALSE;
+    }
+
+    gtk_label_set_text(GTK_LABEL(entry->txt), val ? "Yes" : "No");
+
+    return TRUE;
+}
+
 
 
 
diff --git a/src/gtk+-2.x/ctkevent.c b/src/gtk+-2.x/ctkevent.c
index 664a404..f715185 100644
--- a/src/gtk+-2.x/ctkevent.c
+++ b/src/gtk+-2.x/ctkevent.c
@@ -350,6 +350,7 @@ static void ctk_event_class_init(CtkEventClass *ctk_event_class)
     MAKE_SIGNAL(NV_CTRL_SHOW_GRAPHICS_VISUAL_INDICATOR);
     MAKE_SIGNAL(NV_CTRL_DISPLAY_VRR_MODE);
     MAKE_SIGNAL(NV_CTRL_DISPLAY_VRR_MIN_REFRESH_RATE);
+    MAKE_SIGNAL(NV_CTRL_DISPLAY_VRR_ENABLED);
 #undef MAKE_SIGNAL
 
     /*
@@ -359,7 +360,7 @@ static void ctk_event_class_init(CtkEventClass *ctk_event_class)
      * knows about.
      */
 
-#if NV_CTRL_LAST_ATTRIBUTE != NV_CTRL_DISPLAY_VRR_MIN_REFRESH_RATE
+#if NV_CTRL_LAST_ATTRIBUTE != NV_CTRL_DISPLAY_VRR_ENABLED
 #warning "There are attributes that do not emit signals!"
 #endif
 
diff --git a/src/libXNVCtrl/NVCtrl.h b/src/libXNVCtrl/NVCtrl.h
index 3721fd9..1ae1964 100644
--- a/src/libXNVCtrl/NVCtrl.h
+++ b/src/libXNVCtrl/NVCtrl.h
@@ -3565,7 +3565,18 @@
 
 #define NV_CTRL_DISPLAY_VRR_MIN_REFRESH_RATE                         430 /* R-D- */
 
-#define NV_CTRL_LAST_ATTRIBUTE NV_CTRL_DISPLAY_VRR_MIN_REFRESH_RATE
+/*
+ * NV_CTRL_DISPLAY_VRR_ENABLED - Indicates whether the specified display
+ * device enabled VRR at modeset time, and is capable of VRR flipping if
+ * NV_CTRL_VRR_ALLOWED is set.  If this is FALSE, NV_CTRL_VRR_ALLOWED has no
+ * effect.
+ */
+
+#define NV_CTRL_DISPLAY_VRR_ENABLED                                  431 /* R-D- */
+#define NV_CTRL_DISPLAY_VRR_ENABLED_FALSE                              0
+#define NV_CTRL_DISPLAY_VRR_ENABLED_TRUE                               1
+
+#define NV_CTRL_LAST_ATTRIBUTE NV_CTRL_DISPLAY_VRR_ENABLED
 
 /**************************************************************************/
 
diff --git a/src/libXNVCtrl/version.mk b/src/libXNVCtrl/version.mk
index fa0f583..33d731b 100644
--- a/src/libXNVCtrl/version.mk
+++ b/src/libXNVCtrl/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 418.30
+NVIDIA_VERSION = 418.43
diff --git a/src/parse.c b/src/parse.c
index 551dbcd..d28a0be 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -344,6 +344,7 @@ const AttributeTableEntry attributeTable[] = {
     { "DisplayPortSinkIsAudioCapable",    NV_CTRL_DISPLAYPORT_SINK_IS_AUDIO_CAPABLE,    INT_ATTR, {0,0,0,0,1,0}, {}, "Returns 1 if the DisplayPort display is capable of playing audio, and 0 otherwise."},
     { "DisplayVRRMode",                   NV_CTRL_DISPLAY_VRR_MODE,                     INT_ATTR, {0,0,0,0,1,0}, { .int_flags = {0,0,0,0,0,0,0} }, "Whether the specified display device is G-SYNC or G-SYNC Compatible." },
     { "DisplayVRRMinRefreshRate",         NV_CTRL_DISPLAY_VRR_MIN_REFRESH_RATE,         INT_ATTR, {0,0,0,0,1,0}, { .int_flags = {0,0,0,0,0,0,0} }, "The minimum refresh rate for the specified VRR display device." },
+    { "DisplayVRREnabled",                NV_CTRL_DISPLAY_VRR_ENABLED,                  INT_ATTR, {0,0,0,0,1,0}, { .int_flags = {0,0,0,0,0,0,0} }, "If this is enabled (1), then VRR was enabled on this display at modeset time." },
 
     /* TV */
     { "TVOverScan",                       NV_CTRL_TV_OVERSCAN,                          INT_ATTR, {0,0,0,0,0,0}, { .int_flags = {0,0,0,0,0,0,0} }, "Adjusts the amount of overscan on the specified display device." },
@@ -397,7 +398,7 @@ const int attributeTableLen = ARRAY_LEN(attributeTable);
  * the last attribute that the table knows about.
  */
 
-#if NV_CTRL_LAST_ATTRIBUTE != NV_CTRL_DISPLAY_VRR_MIN_REFRESH_RATE
+#if NV_CTRL_LAST_ATTRIBUTE != NV_CTRL_DISPLAY_VRR_ENABLED
 #warning "Have you forgotten to add a new integer attribute to attributeTable?"
 #endif
 
diff --git a/src/version.h b/src/version.h
index e64aee3..f317b78 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define NVIDIA_VERSION "418.30"
+#define NVIDIA_VERSION "418.43"
diff --git a/src/version.mk b/src/version.mk
index fa0f583..33d731b 100644
--- a/src/version.mk
+++ b/src/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 418.30
+NVIDIA_VERSION = 418.43
diff --git a/version.mk b/version.mk
index fa0f583..33d731b 100644
--- a/version.mk
+++ b/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 418.30
+NVIDIA_VERSION = 418.43