From 888ae7a5e6380408021e3b29c6b32fe07498bb15 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sat, 20 Apr 2013 15:52:02 +0100 Subject: [PATCH] viafb: Autoload on OLPC XO 1.5 only Bug-Debian: https://bugs.debian.org/705788 Forwarded: no 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. Gbp-Pq: Topic bugfix/x86 Gbp-Pq: Name viafb-autoload-on-olpc-xo1.5-only.patch --- drivers/video/fbdev/via/via-core.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/video/fbdev/via/via-core.c b/drivers/video/fbdev/via/via-core.c index b8cd04defc5..702e143c542 100644 --- a/drivers/video/fbdev/via/via-core.c +++ b/drivers/video/fbdev/via/via-core.c @@ -700,7 +700,14 @@ static const struct pci_device_id via_pci_table[] = { .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 const struct dev_pm_ops via_pm_ops = { #ifdef CONFIG_PM_SLEEP -- 2.30.2