aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@fairlite.demon.co.uk>2006-01-19 09:08:40 -0500
committerDave Jones <davej@redhat.com>2006-01-19 19:19:35 -0500
commit3b0e8eadc511eaceba6d6b8d0743359a34ee23c6 (patch)
treed4382c3c6f9cd7b3d11e21d0b6307153d2f8c919
parent168678233ca45af3f74fef60c4265fa5dd217e29 (diff)
[AGPGART] 945GM support for agpgart
Here's a very small diff for 945GM support for agpgart. Patch against 2.6.15. From: Alan Hourihane <alanh@fairlite.demon.co.uk> Signed-off-by: Dave Jones <davej@redhat.com>
-rw-r--r--drivers/char/agp/intel-agp.c15
-rw-r--r--include/linux/pci_ids.h2
2 files changed, 15 insertions, 2 deletions
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index e7bed5047dc..631531fd97a 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -422,7 +422,8 @@ static void intel_i830_init_gtt_entries(void)
422 /* Check it's really I915G */ 422 /* Check it's really I915G */
423 if (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915G_HB || 423 if (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915G_HB ||
424 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915GM_HB || 424 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915GM_HB ||
425 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82945G_HB) 425 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82945G_HB ||
426 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82945GM_HB)
426 gtt_entries = MB(48) - KB(size); 427 gtt_entries = MB(48) - KB(size);
427 else 428 else
428 gtt_entries = 0; 429 gtt_entries = 0;
@@ -431,7 +432,8 @@ static void intel_i830_init_gtt_entries(void)
431 /* Check it's really I915G */ 432 /* Check it's really I915G */
432 if (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915G_HB || 433 if (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915G_HB ||
433 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915GM_HB || 434 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915GM_HB ||
434 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82945G_HB) 435 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82945G_HB ||
436 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82945GM_HB)
435 gtt_entries = MB(64) - KB(size); 437 gtt_entries = MB(64) - KB(size);
436 else 438 else
437 gtt_entries = 0; 439 gtt_entries = 0;
@@ -1681,6 +1683,14 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev,
1681 } 1683 }
1682 name = "945G"; 1684 name = "945G";
1683 break; 1685 break;
1686 case PCI_DEVICE_ID_INTEL_82945GM_HB:
1687 if (find_i830(PCI_DEVICE_ID_INTEL_82945GM_IG)) {
1688 bridge->driver = &intel_915_driver;
1689 } else {
1690 bridge->driver = &intel_845_driver;
1691 }
1692 name = "945GM";
1693 break;
1684 case PCI_DEVICE_ID_INTEL_7505_0: 1694 case PCI_DEVICE_ID_INTEL_7505_0:
1685 bridge->driver = &intel_7505_driver; 1695 bridge->driver = &intel_7505_driver;
1686 name = "E7505"; 1696 name = "E7505";
@@ -1821,6 +1831,7 @@ static struct pci_device_id agp_intel_pci_table[] = {
1821 ID(PCI_DEVICE_ID_INTEL_82915G_HB), 1831 ID(PCI_DEVICE_ID_INTEL_82915G_HB),
1822 ID(PCI_DEVICE_ID_INTEL_82915GM_HB), 1832 ID(PCI_DEVICE_ID_INTEL_82915GM_HB),
1823 ID(PCI_DEVICE_ID_INTEL_82945G_HB), 1833 ID(PCI_DEVICE_ID_INTEL_82945G_HB),
1834 ID(PCI_DEVICE_ID_INTEL_82945GM_HB),
1824 { } 1835 { }
1825}; 1836};
1826 1837
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 5403257ae3e..2726140a673 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2084,6 +2084,8 @@
2084#define PCI_DEVICE_ID_INTEL_82915GM_IG 0x2592 2084#define PCI_DEVICE_ID_INTEL_82915GM_IG 0x2592
2085#define PCI_DEVICE_ID_INTEL_82945G_HB 0x2770 2085#define PCI_DEVICE_ID_INTEL_82945G_HB 0x2770
2086#define PCI_DEVICE_ID_INTEL_82945G_IG 0x2772 2086#define PCI_DEVICE_ID_INTEL_82945G_IG 0x2772
2087#define PCI_DEVICE_ID_INTEL_82945GM_HB 0x27A0
2088#define PCI_DEVICE_ID_INTEL_82945GM_IG 0x27A2
2087#define PCI_DEVICE_ID_INTEL_ICH6_0 0x2640 2089#define PCI_DEVICE_ID_INTEL_ICH6_0 0x2640
2088#define PCI_DEVICE_ID_INTEL_ICH6_1 0x2641 2090#define PCI_DEVICE_ID_INTEL_ICH6_1 0x2641
2089#define PCI_DEVICE_ID_INTEL_ICH6_2 0x2642 2091#define PCI_DEVICE_ID_INTEL_ICH6_2 0x2642