455.23.04455.23.04

3 files changed, 21 insertions, 64 deletions

diff --git a/nvidia-xconfig.c b/nvidia-xconfig.c
index dafe04f..88d2fac 100644
--- a/nvidia-xconfig.c
+++ b/nvidia-xconfig.c
@@ -383,7 +383,8 @@ static void parse_commandline(Options *op, int argc, char *argv[])
             op->metamodes_str = strval;
             break;
 
-        case MULTI_GPU_OPTION:
+        case MULTI_GPU_OPTION: /* fall through */
+        case SLI_OPTION:
             {
                 const char* valid_values[] = {
                     "0",
@@ -391,78 +392,35 @@ static void parse_commandline(Options *op, int argc, char *argv[])
                     "off",
                     "false",
                     "single",
-                    "1",
-                    "yes",
-                    "on",
-                    "true",
-                    "auto",
-                    "afr",
-                    "sfr",
-                    "aa",
+                    "mosaic",
                     NULL
                 };
-                int i;
 
-                /* mark as disabled, so we can remove the option later */
-                
                 if (disable) {
-                    op->multigpu = NV_DISABLE_STRING_OPTION;
-                    break;
-                }
 
-                for (i = 0; valid_values[i]; i++) {
-                    if (!strcasecmp(strval, valid_values[i]))
-                        break;
-                }
+                    /* mark as disabled, so we can remove the option later */
+                    strval = NV_DISABLE_STRING_OPTION;
 
-                if (valid_values[i]) {
-                    op->multigpu = strval;
                 } else {
-                    fprintf(stderr, "Invalid MultiGPU option: %s.\n", strval);
-                    goto fail;
-                }
-            }
-            break;
 
-        case SLI_OPTION:
-            {
-                const char* valid_values[] = {
-                    "0",
-                    "no",
-                    "off",
-                    "false",
-                    "single",
-                    "1",
-                    "yes",
-                    "on",
-                    "true",
-                    "auto",
-                    "afr",
-                    "sfr",
-                    "aa",
-                    "afrofaa",
-                    "mosaic",
-                    NULL
-                };
-                int i;
+                    /* check that the string is valid */
+                    int i;
 
-                /* mark as disabled, so we can remove the option later */
-                
-                if (disable) {
-                    op->sli = NV_DISABLE_STRING_OPTION;
-                    break;
-                }
+                    for (i = 0; valid_values[i]; i++) {
+                        if (!strcasecmp(strval, valid_values[i]))
+                            break;
+                    }
 
-                for (i = 0; valid_values[i]; i++) {
-                    if (!strcasecmp(strval, valid_values[i]))
-                        break;
+                    if (!valid_values[i]) {
+                        fprintf(stderr, "Invalid SLI option: %s.\n", strval);
+                        goto fail;
+                    }
                 }
 
-                if (valid_values[i]) {
-                    op->sli = strval;
+                if (c == MULTI_GPU_OPTION) {
+                    op->multigpu = strval;
                 } else {
-                    fprintf(stderr, "Invalid SLI option: %s.\n", strval);
-                    goto fail;
+                    op->sli = strval;
                 }
             }
             break;
diff --git a/option_table.h b/option_table.h
index b2a9dc9..94ffb10 100644
--- a/option_table.h
+++ b/option_table.h
@@ -382,7 +382,7 @@ static const NVGetoptOption __options[] = {
     { "multigpu", MULTI_GPU_OPTION,
       NVGETOPT_STRING_ARGUMENT | NVGETOPT_ALLOW_DISABLE, NULL,
       "Enable or disable MultiGPU.  Valid values for &MULTIGPU& are "
-      "'Off', 'On', 'Auto', 'AFR', 'SFR', 'AA'." },
+      "'Off' and 'Mosaic'." },
 
     { "multisample-compatibility",
       XCONFIG_BOOL_VAL(MULTISAMPLE_COMPATIBILITY_BOOL_OPTION),
@@ -487,8 +487,7 @@ static const NVGetoptOption __options[] = {
 
     { "sli", SLI_OPTION,
       NVGETOPT_STRING_ARGUMENT | NVGETOPT_ALLOW_DISABLE, NULL,
-      "Enable or disable SLI.  Valid values for &SLI& are 'Off', 'On', 'Auto', "
-      "'AFR', 'SFR', 'AA', 'AFRofAA', 'Mosaic'." },
+      "Enable or disable SLI.  Valid values for &SLI& are 'Off' and 'Mosaic'." },
 
     { "stereo", STEREO_OPTION,
       NVGETOPT_INTEGER_ARGUMENT | NVGETOPT_ALLOW_DISABLE, NULL,
diff --git a/version.mk b/version.mk
index b41f1a9..618e84a 100644
--- a/version.mk
+++ b/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 450.66
+NVIDIA_VERSION = 455.23.04