summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKishore Bodke <kishore.k.bodke@intel.com>2012-04-10 18:24:45 (GMT)
committerTom Zanussi <tom.zanussi@intel.com>2012-04-12 14:07:44 (GMT)
commit629a79a47dfc9d4d1ae5dabce7431bbb7857d6c4 (patch)
treebe970d041eab227d532c9b75eb85359f5d9400ac
parent6402a13cc4bc1842c1f03c75465733c5df2ba596 (diff)
downloadmeta-intel-629a79a47dfc9d4d1ae5dabce7431bbb7857d6c4.tar.gz
Cedartrail: split xorg.conf files.
Have two xorg.conf files. One for pvr-graphics driver. One for vesa graphics driver. Signed-off-by: Kishore Bodke <kishore.k.bodke@intel.com> Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
-rw-r--r--meta-cedartrail/recipes-graphics/xorg-xserver/xserver-xf86-config/cedartrail-nopvr/xorg.conf26
-rw-r--r--meta-cedartrail/recipes-graphics/xorg-xserver/xserver-xf86-config/cedartrail/xorg.conf25
2 files changed, 35 insertions, 16 deletions
diff --git a/meta-cedartrail/recipes-graphics/xorg-xserver/xserver-xf86-config/cedartrail-nopvr/xorg.conf b/meta-cedartrail/recipes-graphics/xorg-xserver/xserver-xf86-config/cedartrail-nopvr/xorg.conf
new file mode 100644
index 0000000..da4fc3c
--- /dev/null
+++ b/meta-cedartrail/recipes-graphics/xorg-xserver/xserver-xf86-config/cedartrail-nopvr/xorg.conf
@@ -0,0 +1,26 @@
1Section "Device"
2 Identifier "Generic VESA"
3 Driver "vesa"
4EndSection
5
6Section "Monitor"
7 Identifier "Generic Monitor"
8 Option "DPMS"
9EndSection
10
11Section "Screen"
12 Identifier "Default Screen"
13 Device "Generic VESA"
14 Monitor "Generic Monitor"
15 DefaultDepth 24
16EndSection
17
18Section "ServerLayout"
19 Identifier "Default Layout"
20 Screen "Default Screen"
21EndSection
22
23Section "ServerFlags"
24 Option "DontZap" "0"
25 Option "AutoAddDevices" "False"
26EndSection
diff --git a/meta-cedartrail/recipes-graphics/xorg-xserver/xserver-xf86-config/cedartrail/xorg.conf b/meta-cedartrail/recipes-graphics/xorg-xserver/xserver-xf86-config/cedartrail/xorg.conf
index da4fc3c..d7c6a59 100644
--- a/meta-cedartrail/recipes-graphics/xorg-xserver/xserver-xf86-config/cedartrail/xorg.conf
+++ b/meta-cedartrail/recipes-graphics/xorg-xserver/xserver-xf86-config/cedartrail/xorg.conf
@@ -1,26 +1,19 @@
1Section "Device" 1Section "Device"
2 Identifier "Generic VESA" 2 Option "DRIDisableVSync" "False"
3 Driver "vesa" 3 Identifier "Card0"
4EndSection 4 Driver "pvr"
5 5 BusID "PCI:0:2:0"
6Section "Monitor" 6 Option "SoftEXA" "Off"
7 Identifier "Generic Monitor" 7 Option "FlipChain" "On"
8 Option "DPMS"
9EndSection
10
11Section "Screen"
12 Identifier "Default Screen"
13 Device "Generic VESA"
14 Monitor "Generic Monitor"
15 DefaultDepth 24
16EndSection 8EndSection
17 9
18Section "ServerLayout" 10Section "ServerLayout"
19 Identifier "Default Layout" 11 Identifier "default screen"
20 Screen "Default Screen" 12 Option "AIGLX" "on"
21EndSection 13EndSection
22 14
23Section "ServerFlags" 15Section "ServerFlags"
24 Option "DontZap" "0" 16 Option "DontZap" "0"
25 Option "AutoAddDevices" "False" 17 Option "AutoAddDevices" "False"
26EndSection 18EndSection
19