[kernel] r19462 - in dists/trunk/linux/debian: . patches patches/debian

[Ben Hutchings]

Author: benh
Date: Mon Oct 29 03:29:43 2012
New Revision: 19462

Log:
cirrus: Disable by default, as it is currently incompatible with xserver-xorg-video-cirrus

Added:
   dists/trunk/linux/debian/patches/debian/cirrus-disable-modeset-by-default.patch
Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/patches/series

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Mon Oct 29 03:19:37 2012	(r19461)
+++ dists/trunk/linux/debian/changelog	Mon Oct 29 03:29:43 2012	(r19462)
@@ -9,6 +9,9 @@
 
   [ Ben Hutchings ]
   * aufs: Update to aufs3.x-rcN-20120827
+  * cirrus: Disable by default, as it is currently incompatible with
+    xserver-xorg-video-cirrus. It can be forced to load with module
+    parameter modeset=1.
 
   [ Uwe Kleine-König ]
   * reenable the rt featureset using 3.6.3-rt8

Added: dists/trunk/linux/debian/patches/debian/cirrus-disable-modeset-by-default.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux/debian/patches/debian/cirrus-disable-modeset-by-default.patch	Mon Oct 29 03:29:43 2012	(r19462)
@@ -0,0 +1,19 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Subject: cirrus: Disable by default
+
+Current Debian userland is not compatible with this driver, so set
+modeset=0 by default (making module init fail).
+xserver-xorg-video-cirrus will need to override this once it is
+compatible, by installing a modprobe config file.
+
+--- a/drivers/gpu/drm/cirrus/cirrus_drv.c
++++ b/drivers/gpu/drm/cirrus/cirrus_drv.c
+@@ -15,7 +15,7 @@
+ 
+ #include "cirrus_drv.h"
+ 
+-int cirrus_modeset = -1;
++int cirrus_modeset = 0;
+ 
+ MODULE_PARM_DESC(modeset, "Disable/Enable modesetting");
+ module_param_named(modeset, cirrus_modeset, int, 0400);

Modified: dists/trunk/linux/debian/patches/series
==============================================================================
--- dists/trunk/linux/debian/patches/series	Mon Oct 29 03:19:37 2012	(r19461)
+++ dists/trunk/linux/debian/patches/series	Mon Oct 29 03:29:43 2012	(r19462)
@@ -46,3 +46,4 @@
 bugfix/alpha/alpha-use-large-data-model.diff
 bugfix/all/speakup-lower-default-software-speech-rate.patch
 debian/iwlwifi-do-not-request-unreleased-firmware.patch
+debian/cirrus-disable-modeset-by-default.patch