[x86] drm: Enable DRM_AST as module

Disable autoloading as it is incompatible with older versions of xserver-xorg-video-ast

svn path=/dists/trunk/linux/; revision=19645

5 files changed, 34 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 71ab6e9003a8..64d0b160ad4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -48,6 +48,9 @@ linux (3.7.1-1~experimental.1) UNRELEASED; urgency=low
   * drm: Enable DRM_UDL as module
     - Disable autoloading as it is incompatible with older versions of
       xserver-xorg-video-displaylink
+  * [x86] drm: Enable DRM_AST as module
+    - Disable autoloading as it is incompatible with older versions of
+      xserver-xorg-video-ast
 
  -- maximilian attems <maks@debian.org>  Thu, 06 Dec 2012 18:14:33 +0100
 
diff --git a/debian/config/config b/debian/config/config
index 2b4fd2c592d2..aec9077cab31 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -395,6 +395,11 @@ CONFIG_DRM_VIA=m
 CONFIG_DRM_SAVAGE=m
 
 ##
+## file: drivers/gpu/drm/ast/Kconfig
+##
+# CONFIG_DRM_AST is not set
+
+##
 ## file: drivers/gpu/drm/cirrus/Kconfig
 ##
 CONFIG_DRM_CIRRUS_QEMU=m
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index a1e05d66a537..61081f6ea46b 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -437,6 +437,11 @@ CONFIG_DRM_MGA=m
 CONFIG_DRM_SIS=m
 
 ##
+## file: drivers/gpu/drm/ast/Kconfig
+##
+CONFIG_DRM_AST=m
+
+##
 ## file: drivers/gpu/drm/gma500/Kconfig
 ##
 CONFIG_DRM_GMA500=m
diff --git a/debian/patches/debian/ast-disable-autoload.patch b/debian/patches/debian/ast-disable-autoload.patch
new file mode 100644
index 000000000000..bb88b2d5b51e
--- /dev/null
+++ b/debian/patches/debian/ast-disable-autoload.patch
@@ -0,0 +1,20 @@
+From: Ben Hutchings <ben@decadent.org.uk>
+Subject: ast: Disable autoload
+Date: Mon, 24 Dec 2012 00:05:07 +0000
+
+This kernel driver is incompatible with older versions of
+xserver-xorg-video-ast, so do not autoload it yet.  It will
+have to be loaded either by local configuration or as part of a
+package of a compatible X driver.
+
+--- a/drivers/gpu/drm/ast/ast_drv.c
++++ b/drivers/gpu/drm/ast/ast_drv.c
+@@ -58,7 +58,7 @@ static DEFINE_PCI_DEVICE_TABLE(pciidlist
+ 	{0, 0, 0},
+ };
+ 
+-MODULE_DEVICE_TABLE(pci, pciidlist);
++/*MODULE_DEVICE_TABLE(pci, pciidlist);*/
+ 
+ static int __devinit
+ ast_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
diff --git a/debian/patches/series b/debian/patches/series
index ee0e7cf3a6a5..ef2a55f4fcda 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -66,3 +66,4 @@ bugfix/all/ptp-Enable-clock-drivers-along-with-associated-net-P.patch
 bugfix/all/sfc-Select-PTP_1588_CLOCK.patch
 bugfix/all/pch_gbe-ptp_pch-Fix-the-dependency-direction-between.patch
 debian/udl-disable-autoload.patch
+debian/ast-disable-autoload.patch