xorg-xserver: extended default xorg.conf

Add sections for both monitor outputs, add example configuration to
disable an output as well as select prefered mode.

3 files changed, 136 insertions, 42 deletions

diff --git a/recipes/xorg-xserver/xserver-xf86-config/apalis-t30/xorg.conf b/recipes/xorg-xserver/xserver-xf86-config/apalis-t30/xorg.conf
index 6fff669..cf65f87 100644
--- a/recipes/xorg-xserver/xserver-xf86-config/apalis-t30/xorg.conf
+++ b/recipes/xorg-xserver/xserver-xf86-config/apalis-t30/xorg.conf
@@ -1,4 +1,12 @@
-# This is the minimal configuration necessary to use the Tegra driver.
+# This is an optimized configuration for Xorg for the Toradex Tegra based
+# Colibri and Apalis modules
+#
+# In order to disable unneeded monitor outputs, use Option "Ignore" "true"
+# (in the monitor section). By defining a prefered resolution mode one
+# can choose a prefered mode for all monitors. However, this mode is only
+# used if the monitor reports it as being supported (through EDID).
+#
+
 # Please refer to the xorg.conf man page for more configuration
 # options provided by the X server, including display-related options
 # provided by RandR 1.2 and higher.
@@ -46,9 +54,15 @@ Section "Device"
 # hardware cursors, and "false" to disable them.
 
     Option      "ARGBHWCursor" "false"
+
+# Use monitor section with identifier, enables explicit disabling
+    Option      "Monitor-LVDS-1" "LVDS"
+    Option      "Monitor-HDMI-1" "HDMI"
 EndSection
 
 Section "ServerFlags"
+
+    Option "DefaultServerLayout" "Default Layout"
 # Set the basic blanking screen saver timeout in minutes.  0 to disable.
 
     Option      "blank time"    "0"
@@ -64,29 +78,48 @@ Section "ServerFlags"
 EndSection
 
 Section "Monitor"
-    Identifier "LVDS-1"
-    Option "DPMS" "off"
+
+    Identifier "HDMI"
+    Option     "Ignore" "false"
+    Option     "DPMS" "off"
+
+# Default orientation
+#    Option     "AboveOf" "LVDS"
+#    Option     "Position" "0 0"
+
+# Explicitly choose a Resolution (check xrandr for available modes)
+#    Option     "PreferredMode" "1280x720"
+
+EndSection
+
+Section "Monitor"
+
+    Identifier "LVDS"
+    Option     "Ignore" "false"
+    Option     "DPMS" "off"
+
+# Note: Its not possible to use explicit modes here. Mode is inherited from framebuffer
+# Check Framebuffer documentation: 
+# http://developer.toradex.com/knowledge-base/framebuffer-(linux)
+
 EndSection
 
 Section "Screen"
+# NVIDIA uses only one screen, even in dual head mode
+# the gluing logic is in the device secition
 
-    Identifier  "Screen LVDS-1"
+    Identifier  "Common Screen"
     Device      "Tegra"
-    Monitor     "LVDS-1"
 
-    DefaultDepth 16
+# This is the primary monitor
+    Monitor     "LVDS"
 
-#    SubSection "Display"
-#        Depth           16
-#        Modes           "1280x720"
-#        ViewPort        0 0
-#        Virtual         1280 720
-#    EndSubsection
+    DefaultDepth 16
 
 EndSection
 
 Section "ServerLayout"
-    Identifier  "TouchView"
-    Screen      "Screen LVDS-1"
-EndSection
+	Identifier  "Default Layout"
 
+	Screen "Common Screen"
+EndSection
diff --git a/recipes/xorg-xserver/xserver-xf86-config/colibri-t20/xorg.conf b/recipes/xorg-xserver/xserver-xf86-config/colibri-t20/xorg.conf
index cfe8d01..0d85a43 100644
--- a/recipes/xorg-xserver/xserver-xf86-config/colibri-t20/xorg.conf
+++ b/recipes/xorg-xserver/xserver-xf86-config/colibri-t20/xorg.conf
@@ -1,4 +1,12 @@
-# This is the minimal configuration necessary to use the Tegra driver.
+# This is an optimized configuration for Xorg for the Toradex Tegra based
+# Colibri and Apalis modules
+#
+# In order to disable unneeded monitor outputs, use Option "Ignore" "true"
+# (in the monitor section). By defining a prefered resolution mode one
+# can choose a prefered mode for all monitors. However, this mode is only
+# used if the monitor reports it as being supported (through EDID).
+#
+
 # Please refer to the xorg.conf man page for more configuration
 # options provided by the X server, including display-related options
 # provided by RandR 1.2 and higher.
@@ -46,9 +54,15 @@ Section "Device"
 # hardware cursors, and "false" to disable them.
 
     Option      "ARGBHWCursor" "false"
+
+# Use monitor section with identifier, enables explicit disabling
+    Option      "Monitor-LVDS-1" "LVDS"
+    Option      "Monitor-HDMI-1" "HDMI"
 EndSection
 
 Section "ServerFlags"
+
+    Option "DefaultServerLayout" "Default Layout"
 # Set the basic blanking screen saver timeout in minutes.  0 to disable.
 
     Option      "blank time"    "0"
@@ -66,32 +80,46 @@ EndSection
 Section "Monitor"
 
     Identifier "HDMI"
+    Option     "Ignore" "false"
+    Option     "DPMS" "off"
 
-EndSection
+# Default orientation
+#    Option     "AboveOf" "LVDS"
+#    Option     "Position" "0 0"
 
-Section "Monitor"
-
-    Identifier "TFTLCD"
+# Explicitly choose a Resolution (check xrandr for available modes)
+#    Option     "PreferredMode" "720x400"
 
 EndSection
 
-Section "Screen"
+Section "Monitor"
 
-    Identifier  "Screen HDMI"
-    Device      "Tegra"
-    Monitor     "HDMI"
+    Identifier "LVDS"
+    Option     "Ignore" "false"
+    Option     "DPMS" "off"
 
-    DefaultDepth 16
+# Note: Its not possible to use explicit modes here. Mode is inherited from framebuffer
+# Check Framebuffer documentation: 
+# http://developer.toradex.com/knowledge-base/framebuffer-(linux)
 
 EndSection
 
 Section "Screen"
+# NVIDIA uses only one screen, even in dual head mode
+# the gluing logic is in the device secition
 
-    Identifier  "Screen TFTLCD"
+    Identifier  "Common Screen"
     Device      "Tegra"
-    Monitor     "TFTLCD"
+
+# This is the primary monitor
+    Monitor     "LVDS"
 
     DefaultDepth 16
 
 EndSection
 
+Section "ServerLayout"
+	Identifier  "Default Layout"
+
+	Screen "Common Screen"
+EndSection
diff --git a/recipes/xorg-xserver/xserver-xf86-config/colibri-t30/xorg.conf b/recipes/xorg-xserver/xserver-xf86-config/colibri-t30/xorg.conf
index 6fff669..0d85a43 100644
--- a/recipes/xorg-xserver/xserver-xf86-config/colibri-t30/xorg.conf
+++ b/recipes/xorg-xserver/xserver-xf86-config/colibri-t30/xorg.conf
@@ -1,4 +1,12 @@
-# This is the minimal configuration necessary to use the Tegra driver.
+# This is an optimized configuration for Xorg for the Toradex Tegra based
+# Colibri and Apalis modules
+#
+# In order to disable unneeded monitor outputs, use Option "Ignore" "true"
+# (in the monitor section). By defining a prefered resolution mode one
+# can choose a prefered mode for all monitors. However, this mode is only
+# used if the monitor reports it as being supported (through EDID).
+#
+
 # Please refer to the xorg.conf man page for more configuration
 # options provided by the X server, including display-related options
 # provided by RandR 1.2 and higher.
@@ -46,9 +54,15 @@ Section "Device"
 # hardware cursors, and "false" to disable them.
 
     Option      "ARGBHWCursor" "false"
+
+# Use monitor section with identifier, enables explicit disabling
+    Option      "Monitor-LVDS-1" "LVDS"
+    Option      "Monitor-HDMI-1" "HDMI"
 EndSection
 
 Section "ServerFlags"
+
+    Option "DefaultServerLayout" "Default Layout"
 # Set the basic blanking screen saver timeout in minutes.  0 to disable.
 
     Option      "blank time"    "0"
@@ -64,29 +78,48 @@ Section "ServerFlags"
 EndSection
 
 Section "Monitor"
-    Identifier "LVDS-1"
-    Option "DPMS" "off"
+
+    Identifier "HDMI"
+    Option     "Ignore" "false"
+    Option     "DPMS" "off"
+
+# Default orientation
+#    Option     "AboveOf" "LVDS"
+#    Option     "Position" "0 0"
+
+# Explicitly choose a Resolution (check xrandr for available modes)
+#    Option     "PreferredMode" "720x400"
+
+EndSection
+
+Section "Monitor"
+
+    Identifier "LVDS"
+    Option     "Ignore" "false"
+    Option     "DPMS" "off"
+
+# Note: Its not possible to use explicit modes here. Mode is inherited from framebuffer
+# Check Framebuffer documentation: 
+# http://developer.toradex.com/knowledge-base/framebuffer-(linux)
+
 EndSection
 
 Section "Screen"
+# NVIDIA uses only one screen, even in dual head mode
+# the gluing logic is in the device secition
 
-    Identifier  "Screen LVDS-1"
+    Identifier  "Common Screen"
     Device      "Tegra"
-    Monitor     "LVDS-1"
 
-    DefaultDepth 16
+# This is the primary monitor
+    Monitor     "LVDS"
 
-#    SubSection "Display"
-#        Depth           16
-#        Modes           "1280x720"
-#        ViewPort        0 0
-#        Virtual         1280 720
-#    EndSubsection
+    DefaultDepth 16
 
 EndSection
 
 Section "ServerLayout"
-    Identifier  "TouchView"
-    Screen      "Screen LVDS-1"
-EndSection
+	Identifier  "Default Layout"
 
+	Screen "Common Screen"
+EndSection