diff options
author | Rahul Saxena <rahul.saxena@intel.com> | 2012-03-19 17:58:38 -0700 |
---|---|---|
committer | Tom Zanussi <tom.zanussi@intel.com> | 2012-03-26 17:41:19 -0500 |
commit | 2e94d8b114a69c4e26535cf0ba0986ef9e80227e (patch) | |
tree | 46fea336bdb2fa5e18093d7c82c62467368c38de | |
parent | 3d9072c883124358e950990d72d2300615326730 (diff) | |
download | meta-intel-2e94d8b114a69c4e26535cf0ba0986ef9e80227e.tar.gz |
meta-cedartrail: seperate xorg.conf files for pvr and no-pvr cases
Seperate xserver configuration files, one file each for the case of with pvr graphics
driver and for "no pvr" (i.e. with VESA driver)
Signed-off-by: Rahul Saxena <rahul.saxena@.intel.com>
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
2 files changed, 34 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 00000000..da4fc3c6 --- /dev/null +++ b/meta-cedartrail/recipes-graphics/xorg-xserver/xserver-xf86-config/cedartrail-nopvr/xorg.conf | |||
@@ -0,0 +1,26 @@ | |||
1 | Section "Device" | ||
2 | Identifier "Generic VESA" | ||
3 | Driver "vesa" | ||
4 | EndSection | ||
5 | |||
6 | Section "Monitor" | ||
7 | Identifier "Generic Monitor" | ||
8 | Option "DPMS" | ||
9 | EndSection | ||
10 | |||
11 | Section "Screen" | ||
12 | Identifier "Default Screen" | ||
13 | Device "Generic VESA" | ||
14 | Monitor "Generic Monitor" | ||
15 | DefaultDepth 24 | ||
16 | EndSection | ||
17 | |||
18 | Section "ServerLayout" | ||
19 | Identifier "Default Layout" | ||
20 | Screen "Default Screen" | ||
21 | EndSection | ||
22 | |||
23 | Section "ServerFlags" | ||
24 | Option "DontZap" "0" | ||
25 | Option "AutoAddDevices" "False" | ||
26 | EndSection | ||
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 da4fc3c6..1d085a4e 100755..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,23 +1,15 @@ | |||
1 | Section "Device" | 1 | Section "Device" |
2 | Identifier "Generic VESA" | 2 | Option "DRIDisableVSync" "False" |
3 | Driver "vesa" | 3 | Identifier "Card0" |
4 | EndSection | 4 | Driver "pvr" |
5 | 5 | BusID "PCI:0:2:0" | |
6 | Section "Monitor" | 6 | Option "SoftEXA" "Off" |
7 | Identifier "Generic Monitor" | 7 | Option "FlipChain" "On" |
8 | Option "DPMS" | ||
9 | EndSection | ||
10 | |||
11 | Section "Screen" | ||
12 | Identifier "Default Screen" | ||
13 | Device "Generic VESA" | ||
14 | Monitor "Generic Monitor" | ||
15 | DefaultDepth 24 | ||
16 | EndSection | 8 | EndSection |
17 | 9 | ||
18 | Section "ServerLayout" | 10 | Section "ServerLayout" |
19 | Identifier "Default Layout" | 11 | Identifier "default screen" |
20 | Screen "Default Screen" | 12 | Option "AIGLX" "on" |
21 | EndSection | 13 | EndSection |
22 | 14 | ||
23 | Section "ServerFlags" | 15 | Section "ServerFlags" |