375.20

5 files changed, 46 insertions, 1 deletions

diff --git a/nvidia-xconfig.c b/nvidia-xconfig.c
index 98d1136..bc10a26 100644
--- a/nvidia-xconfig.c
+++ b/nvidia-xconfig.c
@@ -618,6 +618,16 @@ static void parse_commandline(Options *op, int argc, char *argv[])
             op->num_x_screens = intval;
             break;
 
+        case FORCE_COMPOSITION_PIPELINE_OPTION:
+            op->force_composition_pipeline =
+                disable ? NV_DISABLE_STRING_OPTION : strval;
+            break;
+
+        case FORCE_FULL_COMPOSITION_PIPELINE_OPTION:
+            op->force_full_composition_pipeline =
+                disable ? NV_DISABLE_STRING_OPTION : strval;
+            break;
+
         default:
             goto fail;
         }
diff --git a/nvidia-xconfig.h b/nvidia-xconfig.h
index e0b6d9f..86d3ed2 100644
--- a/nvidia-xconfig.h
+++ b/nvidia-xconfig.h
@@ -153,6 +153,9 @@ typedef struct __options {
     char *flatpanel_properties;
     char *nvidia_3dvision_usb_path;
     char *nvidia_3dvisionpro_config_file;
+    char *force_composition_pipeline;
+    char *force_full_composition_pipeline;
+
     double tv_over_scan;
 
     struct {
diff --git a/option_table.h b/option_table.h
index 624e9e5..754b871 100644
--- a/option_table.h
+++ b/option_table.h
@@ -59,6 +59,8 @@ enum {
     NVIDIA_3DVISION_DISPLAY_TYPE_OPTION,
     RESTORE_ORIGINAL_BACKUP_OPTION,
     NUM_X_SCREENS_OPTION,
+    FORCE_COMPOSITION_PIPELINE_OPTION,
+    FORCE_FULL_COMPOSITION_PIPELINE_OPTION,
 };
 
 /*
@@ -656,5 +658,15 @@ static const NVGetoptOption __options[] = {
       "if possible, even if the current display and GPU both support "
       "uncompressed RGB 4:4:4 output with these modes." },
 
+    { "force-composition-pipeline", FORCE_COMPOSITION_PIPELINE_OPTION,
+      NVGETOPT_STRING_ARGUMENT | NVGETOPT_ALLOW_DISABLE, NULL,
+      "Enable or disable the \"ForceCompositionPipeline\" X "
+      "configuration option." },
+
+    { "force-full-composition-pipeline", FORCE_FULL_COMPOSITION_PIPELINE_OPTION,
+      NVGETOPT_STRING_ARGUMENT | NVGETOPT_ALLOW_DISABLE, NULL,
+      "Enable or disable the \"ForceFullCompositionPipeline\" X "
+      "configuration option." },
+
     { NULL, 0, 0, NULL, NULL },
 };
diff --git a/options.c b/options.c
index 6ca2aa4..6d38cb6 100644
--- a/options.c
+++ b/options.c
@@ -735,4 +735,24 @@ void update_options(Options *op, XConfigScreenPtr screen)
         }
     }
 
+    /* add the ForceCompositionPipeline option */
+
+    if (op->force_composition_pipeline) {
+        remove_option(screen, "ForceCompositionPipeline");
+        if (op->force_composition_pipeline != NV_DISABLE_STRING_OPTION) {
+            set_option_value(screen, "ForceCompositionPipeline",
+                             op->force_composition_pipeline);
+        }
+    }
+
+    /* add the ForceFullCompositionPipeline option */
+
+    if (op->force_full_composition_pipeline) {
+        remove_option(screen, "ForceFullCompositionPipeline");
+        if (op->force_full_composition_pipeline != NV_DISABLE_STRING_OPTION) {
+            set_option_value(screen, "ForceFullCompositionPipeline",
+                             op->force_full_composition_pipeline);
+        }
+    }
+
 } /* update_options() */
diff --git a/version.mk b/version.mk
index b31360a..6301e53 100644
--- a/version.mk
+++ b/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 375.10
+NVIDIA_VERSION = 375.20