From 7ccb96805242101d2aa3e7a7fe095625549bfc12 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 25 Nov 2010 00:25:19 +0100 Subject: make intel driver work on ibm x40 - add kernel support for AGP/DRM/KMS - update intel driver - fix MesaLib (add the correct driver) --- target/linux/config/Config.in.graphics | 35 +++++++++++++++++++++++++++ target/linux/patches/2.6.36/drm-kconfig.patch | 34 ++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 target/linux/patches/2.6.36/drm-kconfig.patch (limited to 'target/linux') diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics index 0bd468de1..bd737fc70 100644 --- a/target/linux/config/Config.in.graphics +++ b/target/linux/config/Config.in.graphics @@ -9,6 +9,26 @@ config ADK_KERNEL_FRAMEBUFFER_CONSOLE config ADK_KERNEL_FB_GEODE boolean default n + +config ADK_KERNEL_DRM + boolean + default n + +config ADK_KERNEL_DRM_I915 + boolean + default n + +config ADK_KERNEL_DRM_I915_KMS + boolean + default n + +config ADK_KERNEL_AGP + boolean + default n + +config ADK_KERNEL_AGP_INTEL + boolean + default n menu "Graphic devices support" @@ -22,5 +42,20 @@ config ADK_KERNEL_FB_GEODE_LX default n help Framebuffer support for ALIX boards. + +config ADK_HARDWARE_GRAPHICS_INTEL + prompt "graphics-intel.................. support for intel graphic cards (AGP/DRM/KMS)" + boolean + select ADK_KERNEL_FB + select ADK_KERNEL_DRM + select ADK_KERNEL_AGP + select ADK_KERNEL_AGP_INTEL + select ADK_KERNEL_FRAMEBUFFER_CONSOLE + select ADK_KERNEL_DRM_I915_KMS + select ADK_KERNEL_DRM_I915 + default y if ADK_HARDWARE_IBMX40 + default n + help + DRM support for intel chipsets. endmenu diff --git a/target/linux/patches/2.6.36/drm-kconfig.patch b/target/linux/patches/2.6.36/drm-kconfig.patch new file mode 100644 index 000000000..aad193c97 --- /dev/null +++ b/target/linux/patches/2.6.36/drm-kconfig.patch @@ -0,0 +1,34 @@ +diff -Nur linux-2.6.36.orig/drivers/gpu/drm/Kconfig linux-2.6.36/drivers/gpu/drm/Kconfig +--- linux-2.6.36.orig/drivers/gpu/drm/Kconfig 2010-10-20 22:30:22.000000000 +0200 ++++ linux-2.6.36/drivers/gpu/drm/Kconfig 2010-11-24 23:08:39.707247343 +0100 +@@ -79,21 +79,6 @@ + selected, the module will be called i810. AGP support is required + for this driver to work. + +-choice +- prompt "Intel 830M, 845G, 852GM, 855GM, 865G" +- depends on DRM && AGP && AGP_INTEL +- optional +- +-config DRM_I830 +- tristate "i830 driver" +- help +- Choose this option if you have a system that has Intel 830M, 845G, +- 852GM, 855GM or 865G integrated graphics. If M is selected, the +- module will be called i830. AGP support is required for this driver +- to work. This driver is used by the older X releases X.org 6.7 and +- XFree86 4.3. If unsure, build this and i915 as modules and the X server +- will load the correct one. +- + config DRM_I915 + tristate "i915 driver" + depends on AGP_INTEL +@@ -127,8 +112,6 @@ + the driver to bind to PCI devices, which precludes loading things + like intelfb. + +-endchoice +- + config DRM_MGA + tristate "Matrox g200/g400" + depends on DRM && PCI -- cgit v1.2.3