Merge branch 'for-2.6.21' of master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
* 'for-2.6.21' of master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart: [AGPGART] intel_agp: PCI id update for Intel 965GM
This commit is contained in:
commit
90f30eccf4
|
@ -18,11 +18,14 @@
|
||||||
#define PCI_DEVICE_ID_INTEL_82965Q_IG 0x2992
|
#define PCI_DEVICE_ID_INTEL_82965Q_IG 0x2992
|
||||||
#define PCI_DEVICE_ID_INTEL_82965G_HB 0x29A0
|
#define PCI_DEVICE_ID_INTEL_82965G_HB 0x29A0
|
||||||
#define PCI_DEVICE_ID_INTEL_82965G_IG 0x29A2
|
#define PCI_DEVICE_ID_INTEL_82965G_IG 0x29A2
|
||||||
|
#define PCI_DEVICE_ID_INTEL_82965GM_HB 0x2A00
|
||||||
|
#define PCI_DEVICE_ID_INTEL_82965GM_IG 0x2A02
|
||||||
|
|
||||||
#define IS_I965 (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82946GZ_HB || \
|
#define IS_I965 (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82946GZ_HB || \
|
||||||
agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965G_1_HB || \
|
agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965G_1_HB || \
|
||||||
agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965Q_HB || \
|
agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965Q_HB || \
|
||||||
agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965G_HB)
|
agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965G_HB || \
|
||||||
|
agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965GM_HB)
|
||||||
|
|
||||||
|
|
||||||
extern int agp_memory_reserved;
|
extern int agp_memory_reserved;
|
||||||
|
@ -1921,7 +1924,13 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev,
|
||||||
bridge->driver = &intel_845_driver;
|
bridge->driver = &intel_845_driver;
|
||||||
name = "965G";
|
name = "965G";
|
||||||
break;
|
break;
|
||||||
|
case PCI_DEVICE_ID_INTEL_82965GM_HB:
|
||||||
|
if (find_i830(PCI_DEVICE_ID_INTEL_82965GM_IG))
|
||||||
|
bridge->driver = &intel_i965_driver;
|
||||||
|
else
|
||||||
|
bridge->driver = &intel_845_driver;
|
||||||
|
name = "965GM";
|
||||||
|
break;
|
||||||
case PCI_DEVICE_ID_INTEL_7505_0:
|
case PCI_DEVICE_ID_INTEL_7505_0:
|
||||||
bridge->driver = &intel_7505_driver;
|
bridge->driver = &intel_7505_driver;
|
||||||
name = "E7505";
|
name = "E7505";
|
||||||
|
@ -2080,6 +2089,7 @@ static struct pci_device_id agp_intel_pci_table[] = {
|
||||||
ID(PCI_DEVICE_ID_INTEL_82965G_1_HB),
|
ID(PCI_DEVICE_ID_INTEL_82965G_1_HB),
|
||||||
ID(PCI_DEVICE_ID_INTEL_82965Q_HB),
|
ID(PCI_DEVICE_ID_INTEL_82965Q_HB),
|
||||||
ID(PCI_DEVICE_ID_INTEL_82965G_HB),
|
ID(PCI_DEVICE_ID_INTEL_82965G_HB),
|
||||||
|
ID(PCI_DEVICE_ID_INTEL_82965GM_HB),
|
||||||
{ }
|
{ }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Reference in New Issue