From c378c1cbcd405de8415c6be9d3fa15d50c0ed6ad Mon Sep 17 00:00:00 2001
From: Dany Marcoux <dmarcoux@posteo.de>
Date: Fri, 29 May 2020 12:56:14 +0200
Subject: [PATCH] autorandr: add crtc option

This option was missing. It is generated by autorandr when executing
`autorandr --save my_profile`.

Fixes #1024
PR #1283
---
 modules/programs/autorandr.nix                           | 9 +++++++++
 .../modules/programs/autorandr/basic-configuration.conf  | 1 +
 tests/modules/programs/autorandr/basic-configuration.nix | 1 +
 3 files changed, 11 insertions(+)

diff --git a/modules/programs/autorandr.nix b/modules/programs/autorandr.nix
index 37406a4b..40cad704 100644
--- a/modules/programs/autorandr.nix
+++ b/modules/programs/autorandr.nix
@@ -55,6 +55,13 @@ let
         default = true;
       };
 
+      crtc = mkOption {
+        type = types.nullOr types.ints.unsigned;
+        description = "Output video display controller.";
+        default = null;
+        example = 0;
+      };
+
       primary = mkOption {
         type = types.bool;
         description = "Whether output should be marked as primary";
@@ -247,6 +254,7 @@ let
     if config.enable then
       concatStringsSep "\n" ([ "output ${name}" ]
         ++ optional (config.position != "") "pos ${config.position}"
+        ++ optional (config.crtc != null) "crtc ${toString config.crtc}"
         ++ optional config.primary "primary"
         ++ optional (config.dpi != null) "dpi ${toString config.dpi}"
         ++ optional (config.gamma != "") "gamma ${config.gamma}"
@@ -315,6 +323,7 @@ in {
                 eDP1.enable = false;
                 DP1 = {
                   enable = true;
+                  crtc = 0;
                   primary = true;
                   position = "0x0";
                   mode = "3840x2160";
diff --git a/tests/modules/programs/autorandr/basic-configuration.conf b/tests/modules/programs/autorandr/basic-configuration.conf
index 980d4d71..681574cf 100644
--- a/tests/modules/programs/autorandr/basic-configuration.conf
+++ b/tests/modules/programs/autorandr/basic-configuration.conf
@@ -3,6 +3,7 @@ off
 
 output DP2
 pos 0x0
+crtc 0
 primary
 mode 1920x1080
 transform 0.600000,0.000000,0.000000,0.000000,0.600000,0.000000,0.000000,0.000000,1.000000
diff --git a/tests/modules/programs/autorandr/basic-configuration.nix b/tests/modules/programs/autorandr/basic-configuration.nix
index 852094c0..19051101 100644
--- a/tests/modules/programs/autorandr/basic-configuration.nix
+++ b/tests/modules/programs/autorandr/basic-configuration.nix
@@ -13,6 +13,7 @@
           config = {
             DP1.enable = false;
             DP2 = {
+              crtc = 0;
               primary = true;
               position = "0x0";
               mode = "1920x1080";