[PATCH] [2.5] Via KT400 agp support (fixes 'unsupported Via chipset (device id: 3189)')

[PATCH] [2.5] Via KT400 agp support (fixes 'unsupported Via chipset (device id: 3189)')

[Nicolas Mailhot]

[-- Attachment #1: Type: text/plain, Size: 2158 bytes --]

[ Re-send with magic keywords in subject, sorry about this ]

Hi,

	This is a tiny patch to support agp on Via KT400 hardware. It basically
adds the KT400 pci ID and lists it as using Via generic setup routines.
This patch has been tested with all GL xscreensaver I could find, and
been reviewed by Dave Jones (full patch history at
http://bugzilla.kernel.org/show_bug.cgi?id=14).

	Please apply.

diff -uNr linux-2.5.47-ac6.orig/drivers/char/agp/agp.c
linux-2.5.47-ac6/drivers/char/agp/agp.c
--- linux-2.5.47-ac6.orig/drivers/char/agp/agp.c	2002-11-11 04:28:26.000000000 +0100
+++ linux-2.5.47-ac6/drivers/char/agp/agp.c	2002-11-20 22:07:32.000000000 +0100
@@ -1150,6 +1150,14 @@
 		.chipset_setup	= via_generic_setup
 	},
 	{
+		.device_id	= PCI_DEVICE_ID_VIA_8377_0,
+		.vendor_id	= PCI_VENDOR_ID_VIA,
+		.chipset	= VIA_APOLLO_KT400,
+		.vendor_name	= "Via",
+		.chipset_name	= "Apollo Pro KT400",
+		.chipset_setup	= via_generic_setup
+	},
+	{
 		.device_id	= PCI_DEVICE_ID_VIA_8653_0,
 		.vendor_id	= PCI_VENDOR_ID_VIA,
 		.chipset	= VIA_APOLLO_PRO,
diff -uNr linux-2.5.47-ac6.orig/include/linux/agp_backend.h linux-2.5.47-ac6/include/linux/agp_backend.h
--- linux-2.5.47-ac6.orig/include/linux/agp_backend.h	2002-11-11 04:28:29.000000000 +0100
+++ linux-2.5.47-ac6/include/linux/agp_backend.h	2002-11-20 22:49:35.000000000 +0100
@@ -61,6 +61,7 @@
 	VIA_APOLLO_PRO,
 	VIA_APOLLO_KX133,
 	VIA_APOLLO_KT133,
+	VIA_APOLLO_KT400,
 	SIS_GENERIC,
 	AMD_GENERIC,
 	AMD_IRONGATE,
diff -uNr linux-2.5.47-ac6.orig/include/linux/pci_ids.h linux-2.5.47-ac6/include/linux/pci_ids.h
--- linux-2.5.47-ac6.orig/include/linux/pci_ids.h	2002-11-20 21:46:32.000000000 +0100
+++ linux-2.5.47-ac6/include/linux/pci_ids.h	2002-11-20 22:28:37.000000000 +0100
@@ -1039,6 +1039,7 @@
 #define PCI_DEVICE_ID_VIA_8361		0x3112 
 #define PCI_DEVICE_ID_VIA_8233A		0x3147
 #define PCI_DEVICE_ID_VIA_8235		0x3177
+#define PCI_DEVICE_ID_VIA_8377_0	0x3189
 #define PCI_DEVICE_ID_VIA_86C100A	0x6100
 #define PCI_DEVICE_ID_VIA_8231		0x8231
 #define PCI_DEVICE_ID_VIA_8231_4	0x8235


-- 
Nicolas Mailhot <Nicolas.Mailhot@laposte.net>

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

[PATCH] [2.5] Via KT400 agp support II (cosmetic)

[Nicolas Mailhot]

[-- Attachment #1: Type: text/plain, Size: 3203 bytes --]

Hi,

	This little patch adds some cosmetic changes to the one that went in
mainline (found when I did the 2.4 port) : 
- corrects the drm startup message so it doesn't print unknown chip for
the kt400
- adds a bunch of ids to the pci database (started with the kt400, ended
with all unreferenced chips on my box)

	This is purely cosmetic ; the necessary part to get the kt400 was in
the first patch. Anyway this is nice to have.

	Please apply,

diff -uNr linux-2.5.49-bk1.orig/drivers/char/drm/drm_agpsupport.h
linux-2.5.49-bk1/drivers/char/drm/drm_agpsupport.h
--- linux-2.5.49-bk1.orig/drivers/char/drm/drm_agpsupport.h	2002-11-22
22:40:12.000000000 +0100
+++ linux-2.5.49-bk1/drivers/char/drm/drm_agpsupport.h	2002-11-26
22:27:52.000000000 +0100
@@ -286,9 +286,11 @@
 			break;
 		case VIA_APOLLO_KT133:	head->chipset = "VIA Apollo KT133";
 			break;
-
+		case VIA_APOLLO_KT400:  head->chipset = "VIA Apollo KT400";
+			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;
diff -uNr linux-2.5.49-bk1.orig/drivers/pci/pci.ids
linux-2.5.49-bk1/drivers/pci/pci.ids
--- linux-2.5.49-bk1.orig/drivers/pci/pci.ids	2002-11-26
22:15:27.000000000 +0100
+++ linux-2.5.49-bk1/drivers/pci/pci.ids	2002-11-26 22:25:45.000000000
+0100
@@ -582,6 +582,7 @@
 	6003  CS 4614/22/24 [CrystalClear SoundFusion Audio Accelerator]
 		1013 4280  Crystal SoundFusion PCI Audio Accelerator
 		1681 0050  Hercules Game Theater XP
+		1681 a011  Hercules Fortissimo III 7.1
 	6004  CS 4614/22/24 [CrystalClear SoundFusion Audio Accelerator]
 	6005  Crystal CS4281 PCI Audio
 		1013 4281  Crystal CS4281 PCI Audio
@@ -2687,6 +2688,7 @@
 	0505  VT82C505
 	0561  VT82C561
 	0571  VT82C586B PIPC Bus Master IDE
+		1458 5002 GA-7VAX Mainboard
 	0576  VT82C576 3V [Apollo Master]
 	0585  VT82C585VP [Apollo VP1/VPX]
 	0586  VT82C586/A/B PCI-to-ISA [Apollo VP]
@@ -2735,6 +2737,7 @@
 		1462 3091  MS-6309 Onboard Audio
 		15dd 7609  Onboard Audio
 	3059  VT8233 AC97 Audio Controller
+		1458 a002  GA-7VAX Onboard Audio (Realtek ALC650)
 	3065  VT6102 [Rhine-II]
 		1186 1400  DFE-530TX rev A
 		1186 1401  DFE-530TX rev B
@@ -2748,6 +2751,7 @@
 	3102  VT8662 Host Bridge
 	3103  VT8615 Host Bridge
 	3104  USB 2.0
+		1458 5004  GA-7VAX Mainboard
 	3109  VT8233C PCI to ISA Bridge
 	3112  VT8361 [KLE133] Host Bridge
 	3128  VT8753 [P4X266 AGP]
@@ -2756,6 +2760,9 @@
 	3148  P4M266 Host Bridge
 	3156  P/KN266 Host Bridge
 	3177  VT8233A ISA Bridge
+		1458 5001 GA-7VAX Mainboard
+	3189  VT8377 [KT400 AGP] Host Bridge
+		1458 5000 GA-7VAX Mainboard
 	5030  VT82C596 ACPI [Apollo PRO]
 	6100  VT85C100A [Rhine II]
 	8231  VT8231 [PCI-to-ISA Bridge]
@@ -2776,6 +2783,7 @@
 	b102  VT8362 AGP Bridge
 	b103  VT8615 AGP Bridge
 	b112  VT8361 [KLE133] AGP Bridge
+	b168  VT8235 PCI Bridge
 1107  Stratus Computers
 	0576  VIA VT82C570MV [Apollo] (Wrong vendor ID!)
 1108  Proteon, Inc.

-- 
Nicolas Mailhot <Nicolas.Mailhot@laPoste.net>

[-- Attachment #2: Ceci est une partie de message numériquement signée --]
[-- Type: application/pgp-signature, Size: 189 bytes --]