[UBUNTU] ICH965GM support (agpgart bits)

[Phillip Lougher]

This patch seems to have already been applied to Feisty:

/home/ubuntu-2.6$ git log --max-count=2 5b87e59b3898d33e11f71fcc037e7d1c6480aee0
commit 5b87e59b3898d33e11f71fcc037e7d1c6480aee0
Author: Kyle McMartin <kyle at ubuntu.com>
Date:   Wed Apr 4 13:01:17 2007 -0400

   UBUNTU: Enable ICH8GM (Crestline) support

commit d2f4858a6cabdcb7682d6b7fc3549e2396324fbd
Merge: 5df920c... 976ba47...
Author: Tim Gardner <timg at tpi.com>
Date:   Wed Apr 11 14:17:17 2007 -0600

   Merge rookery.ubuntu.com:/srv/kernel-team/private/ubuntu-feisty

/home/ubuntu-2.6$ git diff
d2f4858a6cabdcb7682d6b7fc3549e2396324fbd..5b87e59b3898d33e11f71fcc037e7d1c6480aee0
-- drivers/char/agp/intel-agp.c
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index e542a62..a9fdbf9 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -18,11 +18,14 @@
 #define PCI_DEVICE_ID_INTEL_82965Q_IG       0x2992
 #define PCI_DEVICE_ID_INTEL_82965G_HB       0x29A0
 #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 || \
                 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_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;
@@ -1921,7 +1924,13 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev
                       bridge->driver = &intel_845_driver;
               name = "965G";
               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:
               bridge->driver = &intel_7505_driver;
               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_82965Q_HB),
       ID(PCI_DEVICE_ID_INTEL_82965G_HB),
+       ID(PCI_DEVICE_ID_INTEL_82965GM_HB),
       { }
 };


On 4/24/07, Kyle McMartin <kyle at canonical.com> wrote:
> On Tue, Apr 24, 2007 at 09:05:36AM -0400, Kyle McMartin wrote:
> > Signed-off-by: Kyle McMartin <kyle at canonical.com>
> >
>
> These two patches should be targetted for the feisty post-release
> update.
>
> Cheers,
>         Kyle
>
> --
> kernel-team mailing list
> kernel-team at lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
>