260.19.29260.19.29

5 files changed, 44 insertions, 4 deletions

diff --git a/nvidia-xconfig.c b/nvidia-xconfig.c
index 8e01a40..44c4990 100644
--- a/nvidia-xconfig.c
+++ b/nvidia-xconfig.c
@@ -455,7 +455,7 @@ static void parse_commandline(Options *op, int argc, char *argv[])
                 break;
             }
 
-            if (intval < 0 || intval > 10) {
+            if (intval < 0 || intval > 11) {
                 fprintf(stderr, "\n");
                 fprintf(stderr, "Invalid stereo: %d.\n", intval);
                 fprintf(stderr, "\n");
@@ -730,6 +730,14 @@ static void parse_commandline(Options *op, int argc, char *argv[])
                 disable ? NV_DISABLE_STRING_OPTION : strval;
             break;
 
+        case NVIDIA_3DVISION_USB_PATH_OPTION:
+            op->nvidia_3dvision_usb_path = disable ? NV_DISABLE_STRING_OPTION : strval;
+            break;
+
+        case NVIDIA_3DVISIONPRO_CONFIG_FILE_OPTION:
+            op->nvidia_3dvisionpro_config_file = disable ? NV_DISABLE_STRING_OPTION : strval;
+            break;
+
         default:
             goto fail;
         }
diff --git a/nvidia-xconfig.h b/nvidia-xconfig.h
index a886c4f..5dae647 100644
--- a/nvidia-xconfig.h
+++ b/nvidia-xconfig.h
@@ -174,7 +174,8 @@ typedef struct __options {
     char *color_space;
     char *color_range;
     char *flatpanel_properties;
-
+    char *nvidia_3dvision_usb_path;
+    char *nvidia_3dvisionpro_config_file;
     double tv_over_scan;
 
     struct {
diff --git a/option_table.h b/option_table.h
index 5a0b6f1..53899fb 100644
--- a/option_table.h
+++ b/option_table.h
@@ -53,6 +53,8 @@
 #define BUSID_OPTION                        42
 #define DEVICE_OPTION                       43
 #define FLATPANEL_PROPERTIES_OPTION         44
+#define NVIDIA_3DVISION_USB_PATH_OPTION     45
+#define NVIDIA_3DVISIONPRO_CONFIG_FILE_OPTION  46
 
 /*
  * To add a boolean option to nvidia-xconfig:
@@ -516,7 +518,8 @@ static const NVGetoptOption __options[] = {
       "(Disabled), 1 (DDC glasses), 2 (Blueline glasses), 3 (Onboard stereo), "
       "4 (TwinView clone mode stereo), 5 (SeeReal digital flat panel), 6 "
       "(Sharp3D digital flat panel), 7 (Arisawa/Hyundai/Zalman/Pavione/Miracube), "
-      "8 (3D DLP), 9 (3D DLP INV), 10 (NVIDIA 3D VISION)." },
+      "8 (3D DLP), 9 (3D DLP INV), 10 (NVIDIA 3D VISION), "
+      "11 (NVIDIA 3D VISION PRO)." },
 
     { "thermal-configuration-check",
       XCONFIG_BOOL_VAL(THERMAL_CONFIGURATION_CHECK_BOOL_OPTION),
@@ -640,5 +643,17 @@ static const NVGetoptOption __options[] = {
       "Sets the \"ColorRange\" X configuration option. "
       "Valid values for \"COLORRANGE\" are: \"Full\" and \"Limited\"." },
 
+    { "3dvision-usb-path", NVIDIA_3DVISION_USB_PATH_OPTION, NVGETOPT_STRING_ARGUMENT,
+      NULL, "Set this option to specify the sysfs path of the connected "
+      "USB dongle." },
+
+    { "3dvisionpro-config-file", NVIDIA_3DVISIONPRO_CONFIG_FILE_OPTION, NVGETOPT_STRING_ARGUMENT,
+      NULL, "Set this option to specify the NVIDIA 3DVisionPro "
+      "configuration file. Ensure X server has a read and write access "
+      "permissions to this file. NVIDIA X driver stores the hub and "
+      "the pairing configuration in this file to re-use across X restarts. "
+      "If this option is not provided, 3D VisionPro configuration will not "
+      "be stored." },
+
     { NULL, 0, 0, NULL, NULL },
 };
diff --git a/options.c b/options.c
index 9ef85c4..3046459 100644
--- a/options.c
+++ b/options.c
@@ -800,4 +800,20 @@ void update_options(Options *op, XConfigScreenPtr screen)
         }
     }
 
+    /* add the 3DVisionUSBPath option */
+    if (op->nvidia_3dvision_usb_path) {
+        remove_option(screen, "3DVisionUSBPath");
+        if (op->nvidia_3dvision_usb_path != NV_DISABLE_STRING_OPTION) {
+            set_option_value(screen, "3DVisionUSBPath", op->nvidia_3dvision_usb_path);
+        }
+    }
+
+    /* add the 3DVisionProConfigFile option */
+    if (op->nvidia_3dvisionpro_config_file) {
+        remove_option(screen, "3DVisionProConfigFile");
+        if (op->nvidia_3dvisionpro_config_file != NV_DISABLE_STRING_OPTION) {
+            set_option_value(screen, "3DVisionProConfigFile", op->nvidia_3dvisionpro_config_file);
+        }
+    }
+
 } /* update_options() */
diff --git a/version.mk b/version.mk
index f6cd099..4f6e16e 100644
--- a/version.mk
+++ b/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 260.19.21
+NVIDIA_VERSION = 260.19.29