[kernel] r22437 - in dists/sid/linux/debian: . config patches patches/debian

[Ben Hutchings]

Author: benh
Date: Sun Mar  1 06:22:03 2015
New Revision: 22437

Log:
drm: Enable DRM_BOCHS, DRM_QXL as modules

qxl: Disable by default, as it is incompatible with wheezy's
xserver-xorg-video-qxl. It can be forced to load with module
parameter modeset=1.

Added:
   dists/sid/linux/debian/patches/debian/qxl-disable-modeset-by-default.patch
Modified:
   dists/sid/linux/debian/changelog
   dists/sid/linux/debian/config/config
   dists/sid/linux/debian/patches/series

Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog	Sun Mar  1 05:40:01 2015	(r22436)
+++ dists/sid/linux/debian/changelog	Sun Mar  1 06:22:03 2015	(r22437)
@@ -187,6 +187,10 @@
     objects (Closes: #763155)
   * KEYS: request_key() should reget expired keys rather than give EKEYEXPIRED
     (Closes: #758870)
+  * drm: Enable DRM_BOCHS, DRM_QXL as modules
+    - qxl: Disable by default, as it is incompatible with wheezy's
+      xserver-xorg-video-qxl. It can be forced to load with module
+      parameter modeset=1.
 
   [ Helge Deller ]
   * [alpha] build debian-installer udeb packages

Modified: dists/sid/linux/debian/config/config
==============================================================================
--- dists/sid/linux/debian/config/config	Sun Mar  1 05:40:01 2015	(r22436)
+++ dists/sid/linux/debian/config/config	Sun Mar  1 06:22:03 2015	(r22437)
@@ -500,6 +500,11 @@
 # CONFIG_DRM_AST is not set
 
 ##
+## file: drivers/gpu/drm/bochs/Kconfig
+##
+CONFIG_DRM_BOCHS=m
+
+##
 ## file: drivers/gpu/drm/bridge/Kconfig
 ##
 # CONFIG_DRM_PTN3460 is not set
@@ -530,6 +535,11 @@
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 
 ##
+## file: drivers/gpu/drm/qxl/Kconfig
+##
+CONFIG_DRM_QXL=m
+
+##
 ## file: drivers/gpu/drm/radeon/Kconfig
 ##
 # CONFIG_DRM_RADEON_UMS is not set

Added: dists/sid/linux/debian/patches/debian/qxl-disable-modeset-by-default.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux/debian/patches/debian/qxl-disable-modeset-by-default.patch	Sun Mar  1 06:22:03 2015	(r22437)
@@ -0,0 +1,20 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Subject: qxl: Disable by default
+Forwarded: not-needed
+
+This kernel driver is incompatible with older versions of
+xserver-xorg-video-qxl, so do not enable it by default.  It should be
+enabled by a modprobe configuration file installed by
+xserver-xorg-video-qxl in jessie.
+
+--- a/drivers/gpu/drm/qxl/qxl_drv.c
++++ b/drivers/gpu/drm/qxl/qxl_drv.c
+@@ -47,7 +47,7 @@ static DEFINE_PCI_DEVICE_TABLE(pciidlist
+ };
+ MODULE_DEVICE_TABLE(pci, pciidlist);
+ 
+-static int qxl_modeset = -1;
++static int qxl_modeset = 0;
+ int qxl_num_crtc = 4;
+ 
+ MODULE_PARM_DESC(modeset, "Disable/Enable modesetting");

Modified: dists/sid/linux/debian/patches/series
==============================================================================
--- dists/sid/linux/debian/patches/series	Sun Mar  1 05:40:01 2015	(r22436)
+++ dists/sid/linux/debian/patches/series	Sun Mar  1 06:22:03 2015	(r22437)
@@ -542,3 +542,4 @@
 features/all/arcmsr/0019-arcmsr-simplify-ioctl-data-read-write.patch
 bugfix/x86/drm-i915-quietly-reject-attempts-to-create-non-pagealigned-stolen-objects.patch
 bugfix/all/keys-request_key-should-reget-expired-keys-rather-th.patch
+debian/qxl-disable-modeset-by-default.patch