[kernel] r15625 - in dists/lenny/linux-2.6/debian: . patches/bugfix/sparc patches/series

[Dann Frazier]

Author: dannf
Date: Wed May  5 21:31:37 2010
New Revision: 15625

Log:
sunxvr500: Ignore secondary output PCI devices (Closes: #580422)

Added:
   dists/lenny/linux-2.6/debian/patches/bugfix/sparc/sunxvr500-ignore-secondary-output-devices.patch
Modified:
   dists/lenny/linux-2.6/debian/changelog
   dists/lenny/linux-2.6/debian/patches/series/23

Modified: dists/lenny/linux-2.6/debian/changelog
==============================================================================
--- dists/lenny/linux-2.6/debian/changelog	Wed May  5 15:57:35 2010	(r15624)
+++ dists/lenny/linux-2.6/debian/changelog	Wed May  5 21:31:37 2010	(r15625)
@@ -2,6 +2,7 @@
 
   [ dann frazier ]
   * x86: check boundary in setup_node_bootmem() (Closes: 569704)
+  * sunxvr500: Ignore secondary output PCI devices (Closes: #580422)
   
   [ Ben Hutchings ]
   * [sparc64] Fix definition of VMEMMAP_SIZE (Closes: #509202)

Added: dists/lenny/linux-2.6/debian/patches/bugfix/sparc/sunxvr500-ignore-secondary-output-devices.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/lenny/linux-2.6/debian/patches/bugfix/sparc/sunxvr500-ignore-secondary-output-devices.patch	Wed May  5 21:31:37 2010	(r15625)
@@ -0,0 +1,62 @@
+commit bdd32ce95f79fb5cc964cd789d7ae4500bba7c6f
+Author: David S. Miller <davem at davemloft.net>
+Date:   Sun Apr 4 01:12:50 2010 -0700
+
+    sunxvr500: Ignore secondary output PCI devices.
+    
+    These just represent the secondary and further heads attached to the
+    card, and they have different sets of PCI bar registers to map.
+    
+    So don't try to drive them in the main driver.
+    
+    Reported-by: Frans van Berckel <fberckel at xs4all.nl>
+    Tested-by: Frans van Berckel <fberckel at xs4all.nl>
+    Signed-off-by: David S. Miller <davem at davemloft.net>
+
+diff --git a/drivers/video/sunxvr500.c b/drivers/video/sunxvr500.c
+index 4cd5049..3803745 100644
+--- a/drivers/video/sunxvr500.c
++++ b/drivers/video/sunxvr500.c
+@@ -242,11 +242,27 @@ static int __devinit e3d_set_fbinfo(struct e3d_info *ep)
+ static int __devinit e3d_pci_register(struct pci_dev *pdev,
+ 				      const struct pci_device_id *ent)
+ {
++	struct device_node *of_node;
++	const char *device_type;
+ 	struct fb_info *info;
+ 	struct e3d_info *ep;
+ 	unsigned int line_length;
+ 	int err;
+ 
++	of_node = pci_device_to_OF_node(pdev);
++	if (!of_node) {
++		printk(KERN_ERR "e3d: Cannot find OF node of %s\n",
++		       pci_name(pdev));
++		return -ENODEV;
++	}
++
++	device_type = of_get_property(of_node, "device_type", NULL);
++	if (!device_type) {
++		printk(KERN_INFO "e3d: Ignoring secondary output device "
++		       "at %s\n", pci_name(pdev));
++		return -ENODEV;
++	}
++
+ 	err = pci_enable_device(pdev);
+ 	if (err < 0) {
+ 		printk(KERN_ERR "e3d: Cannot enable PCI device %s\n",
+@@ -265,13 +281,7 @@ static int __devinit e3d_pci_register(struct pci_dev *pdev,
+ 	ep->info = info;
+ 	ep->pdev = pdev;
+ 	spin_lock_init(&ep->lock);
+-	ep->of_node = pci_device_to_OF_node(pdev);
+-	if (!ep->of_node) {
+-		printk(KERN_ERR "e3d: Cannot find OF node of %s\n",
+-		       pci_name(pdev));
+-		err = -ENODEV;
+-		goto err_release_fb;
+-	}
++	ep->of_node = of_node;
+ 
+ 	/* Read the PCI base register of the frame buffer, which we
+ 	 * need in order to interpret the RAMDAC_VID_*FB* values in

Modified: dists/lenny/linux-2.6/debian/patches/series/23
==============================================================================
--- dists/lenny/linux-2.6/debian/patches/series/23	Wed May  5 15:57:35 2010	(r15624)
+++ dists/lenny/linux-2.6/debian/patches/series/23	Wed May  5 21:31:37 2010	(r15625)
@@ -2,3 +2,4 @@
 + bugfix/sparc/sparc64-Fix-definition-of-VMEMMAP_SIZE.patch
 + bugfix/all/net-r8169-improved-rx-length-check-errors.patch
 + bugfix/all/megaraid_sas-version-and-Documentation-Update.patch
++ bugfix/sparc/sunxvr500-ignore-secondary-output-devices.patch