From b0ddbb852da31c3b060d14518de8c08bcb1f53f5 Mon Sep 17 00:00:00 2001
From: Alexander Grothe <seahawk1986@gmx.de>
Date: Sat, 27 Jan 2018 21:01:04 +0100
Subject: [PATCH] Move EDID settings to first device section

---
 Manual.org                              | 8 ++++----
 roles/yavdr-network/tasks/main.yml      | 2 +-
 roles/yavdr-xorg/templates/xorg.conf.j2 | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Manual.org b/Manual.org
index 8f4b55e..7604fda 100644
--- a/Manual.org
+++ b/Manual.org
@@ -2211,6 +2211,8 @@ Section "Device"
     BoardName      "Unknown"
 {% endif %}
     Screen          0
+    Option         "ConnectedMonitor" "{{ xorg.primary.connector }}{% if xorg.secondary is defined %}, {{ xorg.secondary.connector }}{% endif %}"
+    Option         "CustomEDID" "{{ xorg.primary.connector }}:/etc/X11/edid.{{ xorg.primary.connector }}.bin{% if xorg.secondary is defined %};{{ xorg.secondary.connector }}:/etc/X11/edid.{{ xorg.secondary.connector }}.bin{% endif %}"
 EndSection
 
 Section "Screen"
@@ -2219,9 +2221,7 @@ Section "Screen"
     Monitor        "Monitor0"
     DefaultDepth    24
     Option         "nvidiaXineramaInfoOrder" "{{ xorg.primary.connector }}"
-    Option         "ConnectedMonitor" "{{ xorg.primary.connector }}{% if xorg.secondary is defined %}, {{ xorg.secondary.connector }}{% endif %}"
     Option         "UseDisplayDevice" "{{ xorg.primary.connector }}"
-    Option         "CustomEDID" "{{ xorg.primary.connector }}:/etc/X11/edid.{{ xorg.primary.connector }}.bin"
     Option         "metamodes" "{{ xorg.primary.connector }}: {{ xorg.primary.mode }} +0+0 {ForceCompositionPipeline=On, ForceFullCompositionPipeline=On}"
     Option         "AllowIndirectGLXProtocol" "off"
     Option         "TripleBuffer" "on"
@@ -2260,9 +2260,9 @@ Section "Screen"
     Monitor        "Monitor1"
     DefaultDepth    24
     Option         "nvidiaXineramaInfoOrder" "{{ xorg.secondary.connector }}"
-    Option         "ConnectedMonitor" "{{ xorg.secondary.connector }}"
+    #Option         "ConnectedMonitor" "{{ xorg.secondary.connector }}"
     Option         "UseDisplayDevice" "{{ xorg.secondary.connector }}"
-    Option         "CustomEDID" "{{ xorg.secondary.connector }}:/etc/X11/edid.{{ xorg.secondary.connector }}.bin"
+    #Option         "CustomEDID" "{{ xorg.secondary.connector }}:/etc/X11/edid.{{ xorg.secondary.connector }}.bin"
     Option         "metamodes" "{{ xorg.secondary.connector }}: {{ xorg.secondary.mode }} +0+0 {ForceCompositionPipeline=On, ForceFullCompositionPipeline=On}"
     Option         "AllowIndirectGLXProtocol" "off"
     Option         "TripleBuffer" "on"
diff --git a/roles/yavdr-network/tasks/main.yml b/roles/yavdr-network/tasks/main.yml
index 34c1160..5d6f1d8 100644
--- a/roles/yavdr-network/tasks/main.yml
+++ b/roles/yavdr-network/tasks/main.yml
@@ -20,7 +20,7 @@
 #   shell: 'ethtool {{ item }} | grep -Po "(?<=Supports\sWake-on:\s).*$"'
 #   register: wol
 #   with_items: '{% for interface in ansible_interfaces if interface != 'lo' and interface != 'bond0' %}'
-  
+
 - name: restart autofs if running
   systemd:
     name: autofs
diff --git a/roles/yavdr-xorg/templates/xorg.conf.j2 b/roles/yavdr-xorg/templates/xorg.conf.j2
index 4bbed53..3d5e7d0 100644
--- a/roles/yavdr-xorg/templates/xorg.conf.j2
+++ b/roles/yavdr-xorg/templates/xorg.conf.j2
@@ -37,6 +37,8 @@ Section "Device"
     BoardName      "Unknown"
 {% endif %}
     Screen          0
+    Option         "ConnectedMonitor" "{{ xorg.primary.connector }}{% if xorg.secondary is defined %}, {{ xorg.secondary.connector }}{% endif %}"
+    Option         "CustomEDID" "{{ xorg.primary.connector }}:/etc/X11/edid.{{ xorg.primary.connector }}.bin{% if xorg.secondary is defined %};{{ xorg.secondary.connector }}:/etc/X11/edid.{{ xorg.secondary.connector }}.bin{% endif %}"
 EndSection
 
 Section "Screen"
@@ -45,9 +47,7 @@ Section "Screen"
     Monitor        "Monitor0"
     DefaultDepth    24
     Option         "nvidiaXineramaInfoOrder" "{{ xorg.primary.connector }}"
-    Option         "ConnectedMonitor" "{{ xorg.primary.connector }}{% if xorg.secondary is defined %}, {{ xorg.secondary.connector }}{% endif %}"
     Option         "UseDisplayDevice" "{{ xorg.primary.connector }}"
-    Option         "CustomEDID" "{{ xorg.primary.connector }}:/etc/X11/edid.{{ xorg.primary.connector }}.bin"
     Option         "metamodes" "{{ xorg.primary.connector }}: {{ xorg.primary.mode }} +0+0 {ForceCompositionPipeline=On, ForceFullCompositionPipeline=On}"
     Option         "AllowIndirectGLXProtocol" "off"
     Option         "TripleBuffer" "on"
@@ -86,9 +86,9 @@ Section "Screen"
     Monitor        "Monitor1"
     DefaultDepth    24
     Option         "nvidiaXineramaInfoOrder" "{{ xorg.secondary.connector }}"
-    Option         "ConnectedMonitor" "{{ xorg.secondary.connector }}"
+    #Option         "ConnectedMonitor" "{{ xorg.secondary.connector }}"
     Option         "UseDisplayDevice" "{{ xorg.secondary.connector }}"
-    Option         "CustomEDID" "{{ xorg.secondary.connector }}:/etc/X11/edid.{{ xorg.secondary.connector }}.bin"
+    #Option         "CustomEDID" "{{ xorg.secondary.connector }}:/etc/X11/edid.{{ xorg.secondary.connector }}.bin"
     Option         "metamodes" "{{ xorg.secondary.connector }}: {{ xorg.secondary.mode }} +0+0 {ForceCompositionPipeline=On, ForceFullCompositionPipeline=On}"
     Option         "AllowIndirectGLXProtocol" "off"
     Option         "TripleBuffer" "on"