[PATCH] [Karmic] UBUNTU: [Upstream] agp/intel: support for new chip variant of IGDNG mobile

[Leann Ogasawara]

Hi Guys,

I'm told the following patch won't hit 2.6.31 in time but is targeted
for 2.6.31.1.  Please consider carrying for Karmic's release until it
does land upstream.

The following changes since commit ba49cde1ecfa245eb16ff957455bf0cf7f12c4e6:
  Tim Gardner (1):
        UBUNTU: Ubuntu-2.6.31-8.28

are available in the git repository at:

  git://kernel.ubuntu.com/ogasawara/ubuntu-karmic.git lp419993

Leann Ogasawara (1):
      UBUNTU: [Upstream] agp/intel: support for new chip variant of IGDNG mobile

 drivers/char/agp/intel-agp.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

>From 24a2ac30228a9b72601f9b430fcb9e8e9e5fd46c Mon Sep 17 00:00:00 2001
From: Leann Ogasawara <leann.ogasawara at canonical.com>
Date: Thu, 27 Aug 2009 09:13:47 -0700
Subject: [PATCH] UBUNTU: [Upstream] agp/intel: support for new chip variant of IGDNG mobile

OriginalLocation: http://patchwork.kernel.org/patch/40965/
BugLink: http://bugs.launchpad.net/bugs/419993

New variant of IGDNG mobile chip has new host bridge id.

Signed-off-by: Zhenyu Wang <zhenyuw at linux.intel.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara at canonical.com>
---
 drivers/char/agp/intel-agp.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index 8c9d50d..c585577 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -49,6 +49,7 @@
 #define PCI_DEVICE_ID_INTEL_IGDNG_D_HB	    0x0040
 #define PCI_DEVICE_ID_INTEL_IGDNG_D_IG	    0x0042
 #define PCI_DEVICE_ID_INTEL_IGDNG_M_HB	    0x0044
+#define PCI_DEVICE_ID_INTEL_IGDNG_MA_HB	    0x0062
 #define PCI_DEVICE_ID_INTEL_IGDNG_M_IG	    0x0046
 
 /* cover 915 and 945 variants */
@@ -81,7 +82,8 @@
 		agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_GM45_HB || \
 		agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_G41_HB || \
 		agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_IGDNG_D_HB || \
-		agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_IGDNG_M_HB)
+		agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_IGDNG_M_HB || \
+		agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_IGDNG_MA_HB)
 
 extern int agp_memory_reserved;
 
@@ -1216,6 +1218,7 @@ static void intel_i965_get_gtt_range(int *gtt_offset, int *gtt_size)
 	case PCI_DEVICE_ID_INTEL_G41_HB:
 	case PCI_DEVICE_ID_INTEL_IGDNG_D_HB:
 	case PCI_DEVICE_ID_INTEL_IGDNG_M_HB:
+	case PCI_DEVICE_ID_INTEL_IGDNG_MA_HB:
 		*gtt_offset = *gtt_size = MB(2);
 		break;
 	default:
@@ -2195,6 +2198,8 @@ static const struct intel_driver_description {
 	    "IGDNG/D", NULL, &intel_i965_driver },
 	{ PCI_DEVICE_ID_INTEL_IGDNG_M_HB, PCI_DEVICE_ID_INTEL_IGDNG_M_IG, 0,
 	    "IGDNG/M", NULL, &intel_i965_driver },
+	{ PCI_DEVICE_ID_INTEL_IGDNG_MA_HB, PCI_DEVICE_ID_INTEL_IGDNG_M_IG, 0,
+	    "IGDNG/MA", NULL, &intel_i965_driver },
 	{ 0, 0, 0, NULL, NULL, NULL }
 };
 
@@ -2398,6 +2403,7 @@ static struct pci_device_id agp_intel_pci_table[] = {
 	ID(PCI_DEVICE_ID_INTEL_G41_HB),
 	ID(PCI_DEVICE_ID_INTEL_IGDNG_D_HB),
 	ID(PCI_DEVICE_ID_INTEL_IGDNG_M_HB),
+	ID(PCI_DEVICE_ID_INTEL_IGDNG_MA_HB),
 	{ }
 };
 
-- 
1.6.3.3