summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2012-09-28 15:33:27 -0700
committerDarren Hart <dvhart@linux.intel.com>2012-09-28 17:53:36 -0700
commit669cf9164ac539711bc06006be798855f7a44c43 (patch)
tree39430231174967b3af0cfcb07c2bc31246df6060
parent34f561ad87aa2e70140a1d1586b84e9018137a5d (diff)
downloadmeta-intel-669cf9164ac539711bc06006be798855f7a44c43.tar.gz
fri2: Update xorg.conf per EMGD 1.14 user guide
Correct the port order to only list SDVOB and LVDS. Update the Edid flags as appropriate. No EDID over LVDS. Enable built-in and edid timings as well as DTDs for the SDVOB port. Force 24-bit mode for LVDS port to work around an apparent bug with EMGD in which the default 18-bit mode results in a dim display using the secondary (LVDS) HDMI port (lower port). Add backlight intensity and inverter frequency specifications for the LVDS port per the note in the EMGD 1.14 User Guide (p 184) for E6xx CPUs. Signed-off-by: Darren Hart <dvhart@linux.intel.com>
-rw-r--r--meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2/xorg.conf29
-rw-r--r--meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend2
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"
23 Option "PcfVersion" "1792" 23 Option "PcfVersion" "1792"
24 Option "ConfigId" "1" 24 Option "ConfigId" "1"
25 Option "ALL/1/name" "e6xx" 25 Option "ALL/1/name" "e6xx"
26 Option "ALL/1/General/PortOrder" "32400" 26 Option "ALL/1/General/PortOrder" "24000"
27 Option "ALL/1/General/DisplayConfig" "1" 27 Option "ALL/1/General/DisplayConfig" "1"
28 Option "ALL/1/General/DisplayDetect" "1" 28 Option "ALL/1/General/DisplayDetect" "1"
29 Option "ALL/1/General/TuningWA" "1" 29 Option "ALL/1/General/TuningWA" "1"
30 Option "ALL/1/Port/4/General/name" "lvds" 30
31 Option "ALL/1/Port/4/General/EdidAvail" "3" 31 # Primary display (upper HDMI port, driven by sDVOB)
32 Option "ALL/1/Port/4/General/EdidNotAvail" "1" 32 Option "ALL/1/Port/2/General/name" "Primary"
33 Option "ALL/1/Port/4/General/Rotation" "0" 33 Option "ALL/1/Port/2/General/Edid" "1"
34 Option "ALL/1/Port/2/General/EdidAvail" "7"
35 Option "ALL/1/Port/2/General/EdidNotAvail" "5"
36 Option "ALL/1/Port/2/General/Rotation" "0"
37 Option "ALL/1/Port/2/Attr/71" "20300"
38
39 # Secondary display (lower HDMI port, driven by LVDS, 1366x768)
40 Option "ALL/1/Port/4/General/name" "Secondary"
34 Option "ALL/1/Port/4/General/Edid" "0" 41 Option "ALL/1/Port/4/General/Edid" "0"
42 Option "ALL/1/Port/4/General/Rotation" "0"
43
44 # Panel depth (the default 18 results in a dim display)
45 # Force dither off for 24-bit panels
46 Option "ALL/1/Port/4/Attr/26" "24"
47 Option "ALL/1/Port/4/Attr/45" "0"
48
49 # Backlight intensity and inverter frequency for E6xx CPUs
50 Option "ALL/1/Port/4/Attr/70" "100"
51 Option "ALL/1/Port/4/Attr/71" "20300"
35EndSection 52EndSection
36 53
37Section "ServerLayout" 54Section "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 @@
1THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" 1THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
2FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:" 2FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:"
3 3PRINC := "${@int(PRINC) + 1}"