Commit 43ed41f6 authored by Dave Jones's avatar Dave Jones
Browse files

[AGPGART] Add new IDs to VIA AGP. 



Culled from the VIA codedrop.
Also fixes up one ID used in amd64-agp to use the
VIA part number instead of the board name in its ID.

Signed-off-by: default avatarDave Jones <davej@redhat.com>
parent 7707ea3b

drivers/char/agp/amd64-agp.c

+1 −1
Original line number Diff line number Diff line
@@ -655,7 +655,7 @@ static struct pci_device_id agp_amd64_pci_table[] = { 
	.class          = (PCI_CLASS_BRIDGE_HOST << 8),

	.class_mask     = ~0,

	.vendor         = PCI_VENDOR_ID_VIA,

	.device         = PCI_DEVICE_ID_VIA_K8M890CE,

	.device         = PCI_DEVICE_ID_VIA_VT3336,

	.subvendor      = PCI_ANY_ID,

	.subdevice      = PCI_ANY_ID,

	},

drivers/char/agp/via-agp.c

+19 −2
Original line number Diff line number Diff line
@@ -380,9 +380,23 @@ static struct agp_device_ids via_agp_device_ids[] __devinitdata = 
	/* P4M800CE */

	{

		.device_id	= PCI_DEVICE_ID_VIA_P4M800CE,

		.chipset_name	= "P4M800CE",

		.chipset_name	= "VT3314",

	},

	/* CX700 */

	{

		.device_id  = PCI_DEVICE_ID_VIA_CX700,

		.chipset_name   = "CX700",

	},

	/* VT3336 */

	{

		.device_id  = PCI_DEVICE_ID_VIA_VT3336,

		.chipset_name   = "VT3336",

	},

	/* P4M890 */

	{

		.device_id  = PCI_DEVICE_ID_VIA_P4M890,

		.chipset_name   = "P4M890",

	},



	{ }, /* dummy final entry, always present */

};
@@ -524,6 +538,9 @@ static const struct pci_device_id agp_via_pci_table[] = { 
	ID(PCI_DEVICE_ID_VIA_83_87XX_1),

	ID(PCI_DEVICE_ID_VIA_3296_0),

	ID(PCI_DEVICE_ID_VIA_P4M800CE),

	ID(PCI_DEVICE_ID_VIA_CX700),

	ID(PCI_DEVICE_ID_VIA_VT3336),

	ID(PCI_DEVICE_ID_VIA_P4M890),

	{ }

};

include/linux/pci_ids.h

+2 −1
Original line number Diff line number Diff line
@@ -1273,7 +1273,8 @@ 
#define PCI_DEVICE_ID_VIA_3296_0	0x0296

#define PCI_DEVICE_ID_VIA_8363_0	0x0305

#define PCI_DEVICE_ID_VIA_P4M800CE	0x0314

#define PCI_DEVICE_ID_VIA_K8M890CE	0x0336

#define PCI_DEVICE_ID_VIA_P4M890	0x0327

#define PCI_DEVICE_ID_VIA_VT3336	0x0336

#define PCI_DEVICE_ID_VIA_8371_0	0x0391

#define PCI_DEVICE_ID_VIA_8501_0	0x0501

#define PCI_DEVICE_ID_VIA_82C561	0x0561