Merge tetrachloride.(none):/mnt/raid/src/kernel/2.5/trees/bk-linus

into tetrachloride.(none):/mnt/raid/src/kernel/2.5/trees/agpgart

drivers/char/agp/ali-agp.c

@@ -9,8 +9,6 @@
 #include <linux/agp_backend.h>
 #include "agp.h"
 
-static int agp_try_unsupported __initdata = 0;
-
 static int ali_fetch_size(void)
 {
 	int i;
@@ -292,16 +290,10 @@ static int __init agp_ali_probe(struct pci_dev *pdev,
 			goto found;
 	}
 
-	if (!agp_try_unsupported) {
-		printk(KERN_ERR PFX
-		     "Unsupported ALi chipset (device id: %04x),"
-		     " you might want to try agp_try_unsupported=1.\n",
-		     pdev->device);
-		return -ENODEV;
-	}
+	printk(KERN_ERR PFX "Unsupported ALi chipset (device id: %04x)\n",
+	     pdev->device);
+	return -ENODEV;
 
-	printk(KERN_WARNING PFX "Trying generic ALi routines"
-	       " for device id: %04x\n", pdev->device);
 
 found:
 	bridge = agp_alloc_bridge();
@@ -328,6 +320,7 @@ static int __init agp_ali_probe(struct pci_dev *pdev,
 			devs[j].chipset_name = "M1641";
 			break;
 		case 0x43:
+			devs[j].chipset_name = "M????";
 			break;
 		case 0x47:
 			devs[j].chipset_name = "M1647";
@@ -397,7 +390,6 @@ static void __exit agp_ali_cleanup(void)
 module_init(agp_ali_init);
 module_exit(agp_ali_cleanup);
 
-MODULE_PARM(agp_try_unsupported, "1i");
 MODULE_AUTHOR("Dave Jones <davej@codemonkey.org.uk>");
 MODULE_LICENSE("GPL and additional rights");
 

drivers/char/agp/amd-k7-agp.c

@@ -11,8 +11,6 @@
 #include <linux/mm.h>
 #include "agp.h"
 
-static int agp_try_unsupported __initdata = 0;
-
 struct amd_page_map {
 	unsigned long *real;
 	unsigned long *remapped;
@@ -404,16 +402,9 @@ static int __init agp_amdk7_probe(struct pci_dev *pdev,
 		}
 	}
 
-	if (!agp_try_unsupported) {
-		printk(KERN_ERR PFX
-		    "Unsupported AMD chipset (device id: %04x),"
-		    " you might want to try agp_try_unsupported=1.\n",
+	printk(KERN_ERR PFX "Unsupported AMD chipset (device id: %04x)\n",
 		    pdev->device);
-		return -ENODEV;
-	}
-
-	printk(KERN_WARNING PFX "Trying generic AMD routines"
-	       " for device id: %04x\n", pdev->device);
+	return -ENODEV;
 
 found:
 	bridge = agp_alloc_bridge();
@@ -476,5 +467,4 @@ static void __exit agp_amdk7_cleanup(void)
 module_init(agp_amdk7_init);
 module_exit(agp_amdk7_cleanup);
 
-MODULE_PARM(agp_try_unsupported, "1i");
 MODULE_LICENSE("GPL and additional rights");

drivers/char/agp/generic.c

@@ -459,9 +459,9 @@ static void agp_v3_parse_one(u32 *mode, u32 *cmd, u32 *tmp)
 
 	/* Clear out unwanted bits. */
 	if (*cmd & AGPSTAT3_8X)
-		*cmd = ~(AGPSTAT3_4X | AGPSTAT3_RSVD);
+		*cmd &= ~(AGPSTAT3_4X | AGPSTAT3_RSVD);
 	if (*cmd & AGPSTAT3_4X)
-		*cmd = ~(AGPSTAT3_8X | AGPSTAT3_RSVD);
+		*cmd &= ~(AGPSTAT3_8X | AGPSTAT3_RSVD);
 }
 
 //FIXME: This doesn't smell right.

drivers/char/agp/intel-agp.c

@@ -13,9 +13,6 @@
 #include <linux/agp_backend.h>
 #include "agp.h"
 
-static int agp_try_unsupported __initdata = 0;
-
-
 static struct aper_size_info_fixed intel_i810_sizes[] =
 {
 	{64, 16384, 4},
@@ -1358,15 +1355,9 @@ static int __init agp_intel_probe(struct pci_dev *pdev,
 		name = "E7205";
 		break;
 	default:
-		if (!agp_try_unsupported) {
-			printk(KERN_ERR PFX
-			    "Unsupported Intel chipset (device id: %04x),"
-			    " you might want to try agp_try_unsupported=1.\n",
+		printk(KERN_ERR PFX "Unsupported Intel chipset (device id: %04x)\n",
 			    pdev->device);
-			return -ENODEV;
-		}
-		bridge->driver = &intel_generic_driver;
-		break;
+		return -ENODEV;
 	};
 
 	bridge->dev = pdev;
@@ -1485,6 +1476,5 @@ static void __exit agp_intel_cleanup(void)
 module_init(agp_intel_init);
 module_exit(agp_intel_cleanup);
 
-MODULE_PARM(agp_try_unsupported, "1i");
 MODULE_AUTHOR("Dave Jones <davej@codemonkey.org.uk>");
 MODULE_LICENSE("GPL and additional rights");

drivers/char/agp/nvidia-agp.c

@@ -25,9 +25,6 @@
 #define NVIDIA_3_APBASE		0x50
 #define NVIDIA_3_APLIMIT	0x54
 
-
-static int agp_try_unsupported __initdata = 0;
-
 static struct _nvidia_private {
 	struct pci_dev *dev_1;
 	struct pci_dev *dev_2;
@@ -299,17 +296,9 @@ static int __init agp_nvidia_probe(struct pci_dev *pdev,
 		nvidia_private.wbc_mask = 0x80000000;
 		break;
 	default:
-		if (!agp_try_unsupported) {
-			printk(KERN_ERR PFX
-			    "Unsupported NVIDIA chipset (device id: %04x),"
-			    " you might want to try agp_try_unsupported=1.\n",
+		printk(KERN_ERR PFX "Unsupported NVIDIA chipset (device id: %04x)\n",
 			    pdev->device);
-			return -ENODEV;
-		}
-		printk(KERN_WARNING PFX
-		    "Trying generic NVIDIA routines for device id: %04x\n",
-		    pdev->device);
-		break;
+		return -ENODEV;
 	}
 
 	bridge = agp_alloc_bridge();
@@ -372,7 +361,6 @@ static void __exit agp_nvidia_cleanup(void)
 module_init(agp_nvidia_init);
 module_exit(agp_nvidia_cleanup);
 
-MODULE_PARM(agp_try_unsupported, "1i");
 MODULE_LICENSE("GPL and additional rights");
 MODULE_AUTHOR("NVIDIA Corporation");
 

drivers/char/agp/sis-agp.c

@@ -8,8 +8,6 @@
 #include <linux/agp_backend.h>
 #include "agp.h"
 
-static int agp_try_unsupported __initdata = 0;
-
 static int sis_fetch_size(void)
 {
 	u8 temp_size;
@@ -187,16 +185,9 @@ static int __init agp_sis_probe(struct pci_dev *pdev,
 		}
 	}
 
-	if (!agp_try_unsupported) {
-		printk(KERN_ERR PFX
-		    "Unsupported SiS chipset (device id: %04x),"
-		    " you might want to try agp_try_unsupported=1.\n",
+	printk(KERN_ERR PFX "Unsupported SiS chipset (device id: %04x)\n",
 		    pdev->device);
-		return -ENODEV;
-	}
-
-	printk(KERN_WARNING PFX "Trying generic SiS routines"
-	       " for device id: %04x\n", pdev->device);
+	return -ENODEV;
 
 found:
 	bridge = agp_alloc_bridge();
@@ -258,5 +249,4 @@ static void __exit agp_sis_cleanup(void)
 module_init(agp_sis_init);
 module_exit(agp_sis_cleanup);
 
-MODULE_PARM(agp_try_unsupported, "1i");
 MODULE_LICENSE("GPL and additional rights");

drivers/char/agp/sworks-agp.c

@@ -8,8 +8,6 @@
 #include <linux/agp_backend.h>
 #include "agp.h"
 
-static int agp_try_unsupported __initdata = 0;
-
 struct serverworks_page_map {
 	unsigned long *real;
 	unsigned long *remapped;
@@ -457,9 +455,9 @@ static int __init agp_serverworks_probe(struct pci_dev *pdev,
 	case 0x0007:
 		break;
 	default:
-		if (!agp_try_unsupported)
-			return -ENODEV;
-		break;
+		printk(KERN_ERR PFX "Unsupported Serverworks chipset "
+				"(device id: %04x)\n", pdev->device);
+		return -ENODEV;
 	}
 
 	serverworks_private.svrwrks_dev = bridge_dev;
@@ -542,6 +540,5 @@ static void __exit agp_serverworks_cleanup(void)
 module_init(agp_serverworks_init);
 module_exit(agp_serverworks_cleanup);
 
-MODULE_PARM(agp_try_unsupported, "1i");
 MODULE_LICENSE("GPL and additional rights");
 

drivers/char/agp/uninorth-agp.c

@@ -10,8 +10,6 @@
 #include <asm/pci-bridge.h>
 #include "agp.h"
 
-static int agp_try_unsupported __initdata = 0;
-
 static int uninorth_fetch_size(void)
 {
 	int i;
@@ -324,15 +322,9 @@ static int __init agp_uninorth_probe(struct pci_dev *pdev,
 		}
 	}
 
-	if (!agp_try_unsupported) {
-		printk(KERN_ERR PFX "Unsupported Apple chipset"
-		       " (device id: %04x).\n", pdev->device);
-		printk(KERN_ERR PFX "You might want to try"
-		       " agp_try_unsupported=1\n");
-		return -ENODEV;
-	}
-	printk(KERN_ERR PFX "Trying generic Uninorth routines"
-	       " for device id %04x\n", pdev->device);
+	printk(KERN_ERR PFX "Unsupported Apple chipset (device id: %04x).\n",
+		pdev->device);
+	return -ENODEV;
 
  found:
 	bridge = agp_alloc_bridge();
@@ -392,6 +384,5 @@ static void __exit agp_uninorth_cleanup(void)
 module_init(agp_uninorth_init);
 module_exit(agp_uninorth_cleanup);
 
-MODULE_PARM(agp_try_unsupported, "1i");
 MODULE_AUTHOR("Ben Herrenschmidt & Paul Mackerras");
 MODULE_LICENSE("GPL");

drivers/char/agp/via-agp.c

@@ -9,9 +9,6 @@
 #include <linux/agp_backend.h>
 #include "agp.h"
 
-static int agp_try_unsupported __initdata = 0;
-
-
 static int via_fetch_size(void)
 {
 	int i;
@@ -382,16 +379,9 @@ static int __init agp_via_probe(struct pci_dev *pdev,
 		}
 	}
 
-	if (!agp_try_unsupported) {
-		printk(KERN_ERR PFX 
-		    "Unsupported VIA chipset (device id: %04x),"
-		    " you might want to try agp_try_unsupported=1.\n",
+	printk(KERN_ERR PFX "Unsupported VIA chipset (device id: %04x)\n",
 		    pdev->device);
-		return -ENODEV;
-	}
-
-	printk(KERN_WARNING PFX "Trying generic VIA routines"
-	       " for device id: %04x\n", pdev->device);
+	return -ENODEV;
 
 found:
 	bridge = agp_alloc_bridge();
@@ -470,6 +460,5 @@ static void __exit agp_via_cleanup(void)
 module_init(agp_via_init);
 module_exit(agp_via_cleanup);
 
-MODULE_PARM(agp_try_unsupported, "1i");
 MODULE_LICENSE("GPL and additional rights");
 MODULE_AUTHOR("Dave Jones <davej@codemonkey.org.uk>");