--- linux/drivers/char/drm/agpsupport.c.bak	Thu Aug  3 23:54:44 2000
+++ linux/drivers/char/drm/agpsupport.c	Thu Aug  3 23:23:27 2000
@@ -289,20 +289,21 @@
 		(*drm_agp.copy_info)(&head->agp_info);
 		head->memory = NULL;
 		switch (head->agp_info.chipset) {
-		case INTEL_GENERIC:  head->chipset = "Intel";          break;
-		case INTEL_LX:       head->chipset = "Intel 440LX";    break;
-		case INTEL_BX:       head->chipset = "Intel 440BX";    break;
-		case INTEL_GX:       head->chipset = "Intel 440GX";    break;
-		case INTEL_I810:     head->chipset = "Intel i810";     break;
-		case VIA_GENERIC:    head->chipset = "VIA";            break;
-		case VIA_VP3:        head->chipset = "VIA VP3";        break;
-		case VIA_MVP3:       head->chipset = "VIA MVP3";       break;
-		case VIA_APOLLO_PRO: head->chipset = "VIA Apollo Pro"; break;
-		case SIS_GENERIC:    head->chipset = "SiS";            break;
-		case AMD_GENERIC:    head->chipset = "AMD";            break;
-		case AMD_IRONGATE:   head->chipset = "AMD Irongate";   break;
-		case ALI_GENERIC:    head->chipset = "ALi";            break;
-		case ALI_M1541:      head->chipset = "ALi M1541";      break;
+		case INTEL_GENERIC:    head->chipset = "Intel";            break;
+		case INTEL_LX:         head->chipset = "Intel 440LX";      break;
+		case INTEL_BX:         head->chipset = "Intel 440BX";      break;
+		case INTEL_GX:         head->chipset = "Intel 440GX";      break;
+		case INTEL_I810:       head->chipset = "Intel i810";       break;
+		case VIA_GENERIC:      head->chipset = "VIA";              break;
+		case VIA_VP3:          head->chipset = "VIA VP3";          break;
+		case VIA_MVP3:         head->chipset = "VIA MVP3";         break;
+		case VIA_APOLLO_PRO:   head->chipset = "VIA Apollo Pro";   break;
+		case VIA_APOLLO_SUPER: head->chipset = "VIA Apollo Super"; break;
+		case SIS_GENERIC:      head->chipset = "SiS";              break;
+		case AMD_GENERIC:      head->chipset = "AMD";              break;
+		case AMD_IRONGATE:     head->chipset = "AMD Irongate";     break;
+		case ALI_GENERIC:      head->chipset = "ALi";              break;
+		case ALI_M1541:        head->chipset = "ALi M1541";        break;
 		default:
 		}
 		DRM_INFO("AGP %d.%d on %s @ 0x%08lx %dMB\n",
--- linux/drivers/char/agp/agpgart_be.c.bak	Sun Jul  9 02:41:10 2000
+++ linux/drivers/char/agp/agpgart_be.c	Thu Aug  3 23:50:28 2000
@@ -2114,6 +2114,12 @@
 #endif /* CONFIG_AGP_SIS */
 
 #ifdef CONFIG_AGP_VIA
+	{ PCI_DEVICE_ID_VIA_8371_0,
+		PCI_VENDOR_ID_VIA,
+		VIA_APOLLO_SUPER,
+		"Via",
+		"Apollo Super",
+		via_generic_setup },
 	{ PCI_DEVICE_ID_VIA_8501_0,
 		PCI_VENDOR_ID_VIA,
 		VIA_MVP4,
@@ -2183,16 +2189,15 @@
 	 * there is a 'generic' bridge entry for this vendor */
 	if (agp_try_unsupported && agp_bridge_info[i].device_id == 0) {
 		printk(KERN_WARNING PFX "Trying generic %s routines"
-		       " for device id: %x\n",
+		       " for device id: %04x\n",
 		       agp_bridge_info[i].vendor_name, pdev->device);
 		agp_bridge.type = agp_bridge_info[i].chipset;
 		return agp_bridge_info[i].chipset_setup (pdev);
 	}
 
-	printk(KERN_ERR PFX "Unsupported %s chipset,"
-	       " you might want to try "
-	       "agp_try_unsupported=1.\n",
-	       agp_bridge_info[i].vendor_name);
+	printk(KERN_ERR PFX "Unsupported %s chipset (device id: %04x),"
+	       " you might want to try agp_try_unsupported=1.\n",
+	       agp_bridge_info[i].vendor_name, pdev->device);
 	return -ENODEV;
 }
 
--- linux/include/linux/agp_backend.h.bak	Thu Aug  3 23:19:45 2000
+++ linux/include/linux/agp_backend.h	Thu Aug  3 23:27:37 2000
@@ -50,6 +50,7 @@
 	VIA_VP3,
 	VIA_MVP3,
 	VIA_MVP4,
+	VIA_APOLLO_SUPER,
 	VIA_APOLLO_PRO,
 	SIS_GENERIC,
 	AMD_GENERIC,