diff options
| author | Daniel Drake <dsd@laptop.org> | 2012-08-08 01:44:33 (GMT) |
|---|---|---|
| committer | Daniel Drake <dsd@laptop.org> | 2012-08-08 02:47:44 (GMT) |
| commit | 8e98e73f14f8761239b06ff15a7e598f2c20d922 (patch) | |
| tree | 44c87cba130e7f171b375b2c947f42f240cfcbc7 | |
| parent | adf30c9463a9b0e35d0bac1fd40196ec13eaafd5 (diff) | |
xo1_75: temporarily switch to fbdev X driver
until the dove driver is updated.
| -rw-r--r-- | modules/xo1_75/kspkglist.50.xo1_75.inc | 2 | ||||
| -rw-r--r-- | modules/xo1_75/kspost.50.xo1_75-tweaks.inc | 55 |
2 files changed, 56 insertions, 1 deletions
diff --git a/modules/xo1_75/kspkglist.50.xo1_75.inc b/modules/xo1_75/kspkglist.50.xo1_75.inc index 99c85ae..a6fdeef 100644 --- a/modules/xo1_75/kspkglist.50.xo1_75.inc +++ b/modules/xo1_75/kspkglist.50.xo1_75.inc @@ -1,4 +1,4 @@ -xorg-x11-drv-dove +# xorg-x11-drv-dove FIXME F18 # currently XO-1.5 / XO-1.75 only olpc-runin-tests diff --git a/modules/xo1_75/kspost.50.xo1_75-tweaks.inc b/modules/xo1_75/kspost.50.xo1_75-tweaks.inc index 6d435c9..fbf1987 100644 --- a/modules/xo1_75/kspost.50.xo1_75-tweaks.inc +++ b/modules/xo1_75/kspost.50.xo1_75-tweaks.inc @@ -6,3 +6,58 @@ ln -sf /lib/systemd/system/serial-getty@.service \ mkdir -p /etc/systemd/system/runin.target.wants ln -sf /lib/systemd/system/serial-getty@.service \ /etc/systemd/system/runin.target.wants/serial-getty@ttyS2.service + +# FIXME fix dove driver for F18 +cat > /usr/share/olpc-utils/xorg.conf.d/xo1.75.conf <<EOF +# This Monitor section is (partially?) unused (#10742) +# as no Screen section is provided, X creates a default monitor. +# but some of these options do seem to be picked up later? +Section "Monitor" + Identifier "Monitor0" + Option "PanelSize" "1200x900" + + # FIXME: http://dev.laptop.org/ticket/9331 + DisplaySize 152 114 +EndSection + +Section "Device" + Identifier "Videocard0" + Option "UseFBDev" "true" + # ShadowFB triggers some segfaults + Option "ShadowFB" "false" + Option "fbdev" "/dev/fb0" + Driver "fbdev" +EndSection + +Section "Module" + Disable "glx" +EndSection + +Section "Extensions" + Option "Composite" "False" +EndSection + +Section "Screen" + Identifier "Screen0" + Device "Videocard0" + Monitor "Monitor0" +EndSection + +Section "ServerLayout" + Identifier "Layout0" + Screen "Screen0" + Option "Damage" "False" +EndSection + +# Keep these in sync across models +Section "Extensions" + Option "DPMS" "off" +EndSection +Section "ServerFlags" + Option "SuspendTime" "0" + Option "OffTime" "0" + Option "BlankTime" "0" + Option "StandbyTime" "0" + Option "DontZap" "true" +EndSection +EOF |