From 95e12712ddffcc7ec0789a8700137afe2e449445 Mon Sep 17 00:00:00 2001 From: Nicolas Dechesne Date: Fri, 19 Oct 2012 15:51:26 +0200 Subject: [PATCH] pandaboard: use xf86-video-omap by default in XSERVER config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also we need to pull in module-exa as xf86-video-omap relies on it, at run time. And replaced the default xorg.conf for 'omap4' machine to take new driver into account. Do not enable HWcursor (e.g. mouse using DSS overlay) to keep things simple for now.. Signed-off-by: Nicolas Dechesne Signed-off-by: Hervé Fache Signed-off-by: Denys Dmytriyenko --- conf/machine/include/omap4.inc | 3 +- .../xserver-xf86-config/omap4/xorg.conf | 40 ++++++------------- 2 files changed, 15 insertions(+), 28 deletions(-) diff --git a/conf/machine/include/omap4.inc b/conf/machine/include/omap4.inc index 96eaae76..ecd23c40 100644 --- a/conf/machine/include/omap4.inc +++ b/conf/machine/include/omap4.inc @@ -11,8 +11,9 @@ XSERVER = "xserver-xorg \ xserver-xorg-extension-dri \ xserver-xorg-extension-dri2 \ xserver-xorg-extension-glx \ + xserver-xorg-module-exa \ xf86-input-evdev \ - xf86-video-fbdev" + xf86-video-omap" # Increase this everytime you change something in the kernel MACHINE_KERNEL_PR = "r1" diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/omap4/xorg.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/omap4/xorg.conf index 0d6ab435..87ded4dd 100644 --- a/recipes-graphics/xorg-xserver/xserver-xf86-config/omap4/xorg.conf +++ b/recipes-graphics/xorg-xserver/xserver-xf86-config/omap4/xorg.conf @@ -1,29 +1,15 @@ -Section "Module" - Load "extmod" - Load "dbe" - Load "glx" - Load "freetype" - Load "type1" - Load "record" - Load "dri" -EndSection +# more /usr/share/X11/xorg.conf.d/99-omap.conf +# X.Org X server configuration file -Section "Monitor" - Identifier "Builtin Default Monitor" -EndSection +Section "Device" + Identifier "Video Device" + Driver "omap" + Option "Debug" "false" + Option "HWcursor" "false" +EndSection -Section "Device" - Identifier "Builtin Default fbdev Device 0" - Driver "fbdev" -EndSection - -Section "Screen" - Identifier "Builtin Default fbdev Screen 0" - Device "Builtin Default fbdev Device 0" - Monitor "Builtin Default Monitor" -EndSection - -Section "ServerLayout" - Identifier "Builtin Default Layout" - Screen "Builtin Default fbdev Screen 0" -EndSection +Section "Screen" + Identifier "Screen" + Monitor "Monitor" + Device "Video Device" +EndSection