summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Plattner <aplattner@nvidia.com>2016-07-15 09:57:32 -0700
committerAaron Plattner <aplattner@nvidia.com>2016-07-15 09:57:32 -0700
commit43e97903b0a6987d1509df7812f72041f793ef16 (patch)
treed9e92a0cf43c643f4887340ff6307c4b99d6a5b3
parent6630faf045797bfdeaa6615d8505e2c76026b100 (diff)
367.35367.35
-rw-r--r--doc/version.mk2
-rw-r--r--samples/version.mk2
-rw-r--r--src/gtk+-2.x/ctkdisplayconfig-utils.c5
-rw-r--r--src/libXNVCtrl/version.mk2
-rw-r--r--src/version.h2
-rw-r--r--src/version.mk2
-rw-r--r--version.mk2
7 files changed, 9 insertions, 8 deletions
diff --git a/doc/version.mk b/doc/version.mk
index 4e2f651..4d657bb 100644
--- a/doc/version.mk
+++ b/doc/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 367.27
+NVIDIA_VERSION = 367.35
diff --git a/samples/version.mk b/samples/version.mk
index 4e2f651..4d657bb 100644
--- a/samples/version.mk
+++ b/samples/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 367.27
+NVIDIA_VERSION = 367.35
diff --git a/src/gtk+-2.x/ctkdisplayconfig-utils.c b/src/gtk+-2.x/ctkdisplayconfig-utils.c
index b585861..cb811fd 100644
--- a/src/gtk+-2.x/ctkdisplayconfig-utils.c
+++ b/src/gtk+-2.x/ctkdisplayconfig-utils.c
@@ -3240,9 +3240,10 @@ static Bool layout_add_gpu_from_server(nvLayoutPtr layout,
if ((ret == NvCtrlSuccess) &&
(valid.valid_type == CTRL_ATTRIBUTE_VALID_TYPE_INT_BITS)) {
- if (valid.allowed_ints & NV_CTRL_BASE_MOSAIC_FULL) {
+ if (valid.allowed_ints & (1 << NV_CTRL_BASE_MOSAIC_FULL)) {
gpu->mosaic_type = MOSAIC_TYPE_BASE_MOSAIC;
- } else if (valid.allowed_ints & NV_CTRL_BASE_MOSAIC_LIMITED) {
+ } else if (valid.allowed_ints &
+ (1 << NV_CTRL_BASE_MOSAIC_LIMITED)) {
gpu->mosaic_type = MOSAIC_TYPE_BASE_MOSAIC_LIMITED;
}
diff --git a/src/libXNVCtrl/version.mk b/src/libXNVCtrl/version.mk
index 4e2f651..4d657bb 100644
--- a/src/libXNVCtrl/version.mk
+++ b/src/libXNVCtrl/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 367.27
+NVIDIA_VERSION = 367.35
diff --git a/src/version.h b/src/version.h
index a65c8b8..646b777 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define NVIDIA_VERSION "367.27"
+#define NVIDIA_VERSION "367.35"
diff --git a/src/version.mk b/src/version.mk
index 4e2f651..4d657bb 100644
--- a/src/version.mk
+++ b/src/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 367.27
+NVIDIA_VERSION = 367.35
diff --git a/version.mk b/version.mk
index 4e2f651..4d657bb 100644
--- a/version.mk
+++ b/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 367.27
+NVIDIA_VERSION = 367.35