frodovdr/yavdr-ansible
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update xorg.conf template for dual screen

Browse Source
This commit is contained in:
Alexander Grothe 2017-07-16 09:58:23 +02:00
parent 9b4ca5e134
commit b56c98179a
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Manual.org
View File

@ -910,7 +910,7 @@ install_avahi: true
</service> </service>
</service-group> </service-group>
#+END_SRC #+END_SRC
** TODO yavdr-remote ** STARTED yavdr-remote
*** default variables *** default variables
*** tasks *** tasks
#+BEGIN_SRC yaml :tangle roles/yavdr-remote/tasks/main.yml :mkdirp yes :padline no #+BEGIN_SRC yaml :tangle roles/yavdr-remote/tasks/main.yml :mkdirp yes :padline no
@ -1637,12 +1637,13 @@ EndSection
Section "ServerLayout" Section "ServerLayout"
Identifier "Layout0" Identifier "Layout0"
Screen 0 "Screen0" Screen 0 "Screen0" 0 0
{% if xorg.secondary is defined %} {% if xorg.secondary is defined %}
Screen 1 "Screen1" RightOf "Screen0" Screen 1 "Screen1" RightOf "Screen0"
{% endif %} {% endif %}
#InputDevice "Keyboard0" "CoreKeyboard" #InputDevice "Keyboard0" "CoreKeyboard"
#InputDevice "Mouse0" "CorePointer" #InputDevice "Mouse0" "CorePointer"
Option "Xinerama" "0"
EndSection EndSection
Section "InputClass" Section "InputClass"
@ -1663,7 +1664,7 @@ Section "Device"
Identifier "Device0" Identifier "Device0"
Driver "nvidia" Driver "nvidia"
VendorName "NVIDIA Corporation" VendorName "NVIDIA Corporation"
Option "NoLogo" "true" Option "NoLogo" "true"
{% if xorg.primary.bus_id is defined %} {% if xorg.primary.bus_id is defined %}
BoardName "{{ xorg.primary.gpu_name }}" BoardName "{{ xorg.primary.gpu_name }}"
BusID "{{ xorg.primary.bus_id }}" BusID "{{ xorg.primary.bus_id }}"
@ -1679,7 +1680,7 @@ Section "Screen"
Monitor "Monitor0" Monitor "Monitor0"
DefaultDepth 24 DefaultDepth 24
Option "nvidiaXineramaInfoOrder" "{{ xorg.primary.connector }}" Option "nvidiaXineramaInfoOrder" "{{ xorg.primary.connector }}"
Option "ConnectedMonitor" "{{ xorg.primary.connector }}" Option "ConnectedMonitor" "{{ xorg.primary.connector }}{% if xorg.secondary is defined %}, {{ xorg.secondary.connector }}{% endif %}"
Option "UseDisplayDevice" "{{ xorg.primary.connector }}" Option "UseDisplayDevice" "{{ xorg.primary.connector }}"
Option "CustomEDID" "{{ xorg.primary.connector }}:/etc/X11/edid.{{ xorg.primary.connector }}.bin" Option "CustomEDID" "{{ xorg.primary.connector }}:/etc/X11/edid.{{ xorg.primary.connector }}.bin"
Option "metamodes" "{{ xorg.primary.connector }}: {{ xorg.primary.mode }} +0+0" Option "metamodes" "{{ xorg.primary.connector }}: {{ xorg.primary.mode }} +0+0"

7
roles/yavdr-xorg/templates/xorg.conf.j2
View File

@ -2,12 +2,13 @@
Section "ServerLayout" Section "ServerLayout"
Identifier "Layout0" Identifier "Layout0"
Screen 0 "Screen0" Screen 0 "Screen0" 0 0
{% if xorg.secondary is defined %} {% if xorg.secondary is defined %}
Screen 1 "Screen1" RightOf "Screen0" Screen 1 "Screen1" RightOf "Screen0"
{% endif %} {% endif %}
#InputDevice "Keyboard0" "CoreKeyboard" #InputDevice "Keyboard0" "CoreKeyboard"
#InputDevice "Mouse0" "CorePointer" #InputDevice "Mouse0" "CorePointer"
Option "Xinerama" "0"
EndSection EndSection
Section "InputClass" Section "InputClass"
@ -28,7 +29,7 @@ Section "Device"
Identifier "Device0" Identifier "Device0"
Driver "nvidia" Driver "nvidia"
VendorName "NVIDIA Corporation" VendorName "NVIDIA Corporation"
Option "NoLogo" "true" Option "NoLogo" "true"
{% if xorg.primary.bus_id is defined %} {% if xorg.primary.bus_id is defined %}
BoardName "{{ xorg.primary.gpu_name }}" BoardName "{{ xorg.primary.gpu_name }}"
BusID "{{ xorg.primary.bus_id }}" BusID "{{ xorg.primary.bus_id }}"
@ -44,7 +45,7 @@ Section "Screen"
Monitor "Monitor0" Monitor "Monitor0"
DefaultDepth 24 DefaultDepth 24
Option "nvidiaXineramaInfoOrder" "{{ xorg.primary.connector }}" Option "nvidiaXineramaInfoOrder" "{{ xorg.primary.connector }}"
Option "ConnectedMonitor" "{{ xorg.primary.connector }}" Option "ConnectedMonitor" "{{ xorg.primary.connector }}{% if xorg.secondary is defined %}, {{ xorg.secondary.connector }}{% endif %}"
Option "UseDisplayDevice" "{{ xorg.primary.connector }}" Option "UseDisplayDevice" "{{ xorg.primary.connector }}"
Option "CustomEDID" "{{ xorg.primary.connector }}:/etc/X11/edid.{{ xorg.primary.connector }}.bin" Option "CustomEDID" "{{ xorg.primary.connector }}:/etc/X11/edid.{{ xorg.primary.connector }}.bin"
Option "metamodes" "{{ xorg.primary.connector }}: {{ xorg.primary.mode }} +0+0" Option "metamodes" "{{ xorg.primary.connector }}: {{ xorg.primary.mode }} +0+0"