2 files changed, 24 insertions, 7 deletions

diff --git a/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2/xorg.conf b/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2/xorg.conf
index 73736aca..8c315658 100644
--- a/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2/xorg.conf
+++ b/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2/xorg.conf
@@ -23,15 +23,32 @@ Section "Device"
     Option     "PcfVersion"            "1792"
     Option     "ConfigId"              "1"
     Option     "ALL/1/name"                   "e6xx"
-    Option     "ALL/1/General/PortOrder"      "32400"
+    Option     "ALL/1/General/PortOrder"      "24000"
     Option     "ALL/1/General/DisplayConfig"  "1"
     Option     "ALL/1/General/DisplayDetect"  "1"
-    Option     "ALL/1/General/TuningWA" "1"
-    Option     "ALL/1/Port/4/General/name"           "lvds"
-    Option     "ALL/1/Port/4/General/EdidAvail"      "3"
-    Option     "ALL/1/Port/4/General/EdidNotAvail"   "1"
-    Option     "ALL/1/Port/4/General/Rotation"       "0"
+    Option     "ALL/1/General/TuningWA"       "1"
+
+    # Primary display (upper HDMI port, driven by sDVOB)
+    Option     "ALL/1/Port/2/General/name"           "Primary"
+    Option     "ALL/1/Port/2/General/Edid"           "1"
+    Option     "ALL/1/Port/2/General/EdidAvail"      "7"
+    Option     "ALL/1/Port/2/General/EdidNotAvail"   "5"
+    Option     "ALL/1/Port/2/General/Rotation"       "0"
+    Option     "ALL/1/Port/2/Attr/71"                "20300"
+
+    # Secondary display (lower HDMI port, driven by LVDS, 1366x768)
+    Option     "ALL/1/Port/4/General/name"           "Secondary"
     Option     "ALL/1/Port/4/General/Edid"           "0"
+    Option     "ALL/1/Port/4/General/Rotation"       "0"
+
+    # Panel depth (the default 18 results in a dim display)
+    # Force dither off for 24-bit panels
+    Option     "ALL/1/Port/4/Attr/26"                "24"
+    Option     "ALL/1/Port/4/Attr/45"                "0"
+
+    # Backlight intensity and inverter frequency for E6xx CPUs
+    Option     "ALL/1/Port/4/Attr/70"                "100"
+    Option     "ALL/1/Port/4/Attr/71"                "20300"
 EndSection
 
 Section "ServerLayout"
diff --git a/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
index 4b8d0e65..a6d7d8e2 100644
--- a/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
+++ b/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
@@ -1,3 +1,3 @@
 THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
 FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:"
-
+PRINC := "${@int(PRINC) + 1}"