[kernel] r20212 - in dists/wheezy/linux/debian: . installer/i386/modules/i386 patches patches/bugfix/x86

[Ben Hutchings]

Author: benh
Date: Sat Jun  8 17:29:26 2013
New Revision: 20212

Log:
[i386] udeb: Add viafb to fb-modules (Closes: #705788)

- viafb: Autoload on OLPC XO 1.5 only

Added:
   dists/wheezy/linux/debian/patches/bugfix/x86/viafb-autoload-on-olpc-xo1.5-only.patch
Modified:
   dists/wheezy/linux/debian/changelog
   dists/wheezy/linux/debian/installer/i386/modules/i386/fb-modules
   dists/wheezy/linux/debian/patches/series

Modified: dists/wheezy/linux/debian/changelog
==============================================================================
--- dists/wheezy/linux/debian/changelog	Sat Jun  8 17:22:11 2013	(r20211)
+++ dists/wheezy/linux/debian/changelog	Sat Jun  8 17:29:26 2013	(r20212)
@@ -196,6 +196,8 @@
   * udf: Fix handling of i_blocks (Closes: #704269)
   * kbuild: Fix missing '\n' for NEW symbols in yes "" | make oldconfig
     >conf.new (Closes: #636029)
+  * [i386] udeb: Add viafb to fb-modules (Closes: #705788)
+    - viafb: Autoload on OLPC XO 1.5 only
 
   [ Jonathan Nieder ]
   * ext3,ext4,nfsd: dir_index: Return 64-bit readdir cookies for NFSv3 and 4

Modified: dists/wheezy/linux/debian/installer/i386/modules/i386/fb-modules
==============================================================================
--- dists/wheezy/linux/debian/installer/i386/modules/i386/fb-modules	Sat Jun  8 17:22:11 2013	(r20211)
+++ dists/wheezy/linux/debian/installer/i386/modules/i386/fb-modules	Sat Jun  8 17:29:26 2013	(r20212)
@@ -2,3 +2,4 @@
 lxfb ?
 vesafb ?
 vga16fb
+viafb

Added: dists/wheezy/linux/debian/patches/bugfix/x86/viafb-autoload-on-olpc-xo1.5-only.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/wheezy/linux/debian/patches/bugfix/x86/viafb-autoload-on-olpc-xo1.5-only.patch	Sat Jun  8 17:29:26 2013	(r20212)
@@ -0,0 +1,33 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sat, 20 Apr 2013 15:52:02 +0100
+Subject: viafb: Autoload on OLPC XO 1.5 only
+Bug-Debian: http://bugs.debian.org/705788
+
+It appears that viafb won't work automatically on all the boards for
+which it has a PCI device ID match.  Currently, it is blacklisted by
+udev along with most other framebuffer drivers, so this doesn't matter
+much.
+
+However, this driver is required for console support on the XO 1.5.
+We need to allow it to be autoloaded on this model only, and then
+un-blacklist it in udev.
+
+---
+--- a/drivers/video/via/via-core.c
++++ b/drivers/video/via/via-core.c
+@@ -754,7 +754,14 @@ static struct pci_device_id via_pci_tabl
+ 	  .driver_data = UNICHROME_VX900 },
+ 	{ }
+ };
+-MODULE_DEVICE_TABLE(pci, via_pci_table);
++
++static const struct pci_device_id via_pci_autoload_table[] __initconst = {
++	/* OLPC XO 1.5 */
++	{ PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_VX855_DID),
++	  .subvendor = 0x152d, .subdevice = 0x0833 },
++	{ }
++};
++MODULE_DEVICE_TABLE(pci, via_pci_autoload_table);
+ 
+ static struct pci_driver via_driver = {
+ 	.name		= "viafb",

Modified: dists/wheezy/linux/debian/patches/series
==============================================================================
--- dists/wheezy/linux/debian/patches/series	Sat Jun  8 17:22:11 2013	(r20211)
+++ dists/wheezy/linux/debian/patches/series	Sat Jun  8 17:29:26 2013	(r20212)
@@ -653,3 +653,4 @@
 
 bugfix/all/udf-Fix-handling-of-i_blocks.patch
 bugfix/all/kbuild-Fix-missing-n-for-NEW-symbols-in-yes-make-old.patch
+bugfix/x86/viafb-autoload-on-olpc-xo1.5-only.patch