From 1ef383f5a2680f892aa0e7d8c4b8449dcce90497 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 29 Oct 2012 03:29:43 +0000 Subject: [PATCH] cirrus: Disable by default, as it is currently incompatible with xserver-xorg-video-cirrus svn path=/dists/trunk/linux/; revision=19462 --- debian/changelog | 3 +++ .../cirrus-disable-modeset-by-default.patch | 19 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 23 insertions(+) create mode 100644 debian/patches/debian/cirrus-disable-modeset-by-default.patch diff --git a/debian/changelog b/debian/changelog index 91f37b2e1..962e5b9b5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ linux (3.6.4-1~experimental.1) UNRELEASED; urgency=low [ 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 diff --git a/debian/patches/debian/cirrus-disable-modeset-by-default.patch b/debian/patches/debian/cirrus-disable-modeset-by-default.patch new file mode 100644 index 000000000..71723d0f3 --- /dev/null +++ b/debian/patches/debian/cirrus-disable-modeset-by-default.patch @@ -0,0 +1,19 @@ +From: Ben Hutchings +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); diff --git a/debian/patches/series b/debian/patches/series index 685419f38..26e952068 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -46,3 +46,4 @@ debian/debugfs-set-default-mode-to-700.patch 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