Commit e60a48f5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart 

* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
  [AGPGART] VIA PT880 Ultra support.
  [AGPGART] Fix Nforce3 suspend on amd64.
  [AGPGART] Enable SIS AGP driver on x86-64 for EM64T systems
parents 2c56554e 7dd1d9b8

drivers/char/agp/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ config AGP_NVIDIA 


config AGP_SIS

	tristate "SiS chipset support"

	depends on AGP && X86_32

	depends on AGP

	help

	  This option gives you AGP support for the GLX component of

	  X on Silicon Integrated Systems [SiS] chipsets.

drivers/char/agp/amd64-agp.c

+3 −0
Original line number Diff line number Diff line
@@ -617,6 +617,9 @@ static int agp_amd64_resume(struct pci_dev *pdev) 
	pci_set_power_state(pdev, PCI_D0);

	pci_restore_state(pdev);



	if (pdev->vendor == PCI_VENDOR_ID_NVIDIA)

		nforce3_agp_init(pdev);



	return amd_8151_configure();

}

drivers/char/agp/via-agp.c

+7 −0
Original line number Diff line number Diff line
@@ -345,6 +345,12 @@ static struct agp_device_ids via_agp_device_ids[] __devinitdata = 
		.chipset_name	= "PT880",

	},



	/* PT880 Ultra */

	{

		.device_id	= PCI_DEVICE_ID_VIA_PT880ULTRA,

		.chipset_name	= "PT880 Ultra",

	},



	/* PT890 */

	{

		.device_id	= PCI_DEVICE_ID_VIA_8783_0,
@@ -511,6 +517,7 @@ static struct pci_device_id agp_via_pci_table[] = { 
	ID(PCI_DEVICE_ID_VIA_8763_0),

	ID(PCI_DEVICE_ID_VIA_8378_0),

	ID(PCI_DEVICE_ID_VIA_PT880),

	ID(PCI_DEVICE_ID_VIA_PT880ULTRA),

	ID(PCI_DEVICE_ID_VIA_8783_0),

	ID(PCI_DEVICE_ID_VIA_PX8X0_0),

	ID(PCI_DEVICE_ID_VIA_3269_0),

include/linux/pci_ids.h

+1 −0
Original line number Diff line number Diff line
@@ -1231,6 +1231,7 @@ 
#define PCI_DEVICE_ID_VIA_8380_0	0x0204

#define PCI_DEVICE_ID_VIA_3238_0	0x0238

#define PCI_DEVICE_ID_VIA_PT880		0x0258

#define PCI_DEVICE_ID_VIA_PT880ULTRA	0x0308

#define PCI_DEVICE_ID_VIA_PX8X0_0	0x0259

#define PCI_DEVICE_ID_VIA_3269_0	0x0269

#define PCI_DEVICE_ID_VIA_K8T800PRO_0	0x0282