diff options
author | Zhenyu Wang <zhenyuw@linux.intel.com> | 2009-06-05 03:38:36 -0400 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2009-06-05 07:19:39 -0400 |
commit | 32cb055b57eab803ea82b76dc913b0378e5af145 (patch) | |
tree | e2cf3bc967c4fd7ee9f83445d5fb7eb77abfda68 /drivers/char | |
parent | b962442e46a9340bdbc6711982c59ff0cc2b5afb (diff) |
agp/intel: Add support for new chipsets
Both desktop and mobile versions are added.
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/agp/intel-agp.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c index 3686912427ba..7a748fa0dfce 100644 --- a/drivers/char/agp/intel-agp.c +++ b/drivers/char/agp/intel-agp.c | |||
@@ -46,6 +46,10 @@ | |||
46 | #define PCI_DEVICE_ID_INTEL_G45_IG 0x2E22 | 46 | #define PCI_DEVICE_ID_INTEL_G45_IG 0x2E22 |
47 | #define PCI_DEVICE_ID_INTEL_G41_HB 0x2E30 | 47 | #define PCI_DEVICE_ID_INTEL_G41_HB 0x2E30 |
48 | #define PCI_DEVICE_ID_INTEL_G41_IG 0x2E32 | 48 | #define PCI_DEVICE_ID_INTEL_G41_IG 0x2E32 |
49 | #define PCI_DEVICE_ID_INTEL_IGDNG_D_HB 0x0040 | ||
50 | #define PCI_DEVICE_ID_INTEL_IGDNG_D_IG 0x0042 | ||
51 | #define PCI_DEVICE_ID_INTEL_IGDNG_M_HB 0x0044 | ||
52 | #define PCI_DEVICE_ID_INTEL_IGDNG_M_IG 0x0046 | ||
49 | 53 | ||
50 | /* cover 915 and 945 variants */ | 54 | /* cover 915 and 945 variants */ |
51 | #define IS_I915 (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_E7221_HB || \ | 55 | #define IS_I915 (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_E7221_HB || \ |
@@ -75,7 +79,9 @@ | |||
75 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_Q45_HB || \ | 79 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_Q45_HB || \ |
76 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_G45_HB || \ | 80 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_G45_HB || \ |
77 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_GM45_HB || \ | 81 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_GM45_HB || \ |
78 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_G41_HB) | 82 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_G41_HB || \ |
83 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_IGDNG_D_HB || \ | ||
84 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_IGDNG_M_HB) | ||
79 | 85 | ||
80 | extern int agp_memory_reserved; | 86 | extern int agp_memory_reserved; |
81 | 87 | ||
@@ -1211,6 +1217,8 @@ static void intel_i965_get_gtt_range(int *gtt_offset, int *gtt_size) | |||
1211 | case PCI_DEVICE_ID_INTEL_Q45_HB: | 1217 | case PCI_DEVICE_ID_INTEL_Q45_HB: |
1212 | case PCI_DEVICE_ID_INTEL_G45_HB: | 1218 | case PCI_DEVICE_ID_INTEL_G45_HB: |
1213 | case PCI_DEVICE_ID_INTEL_G41_HB: | 1219 | case PCI_DEVICE_ID_INTEL_G41_HB: |
1220 | case PCI_DEVICE_ID_INTEL_IGDNG_D_HB: | ||
1221 | case PCI_DEVICE_ID_INTEL_IGDNG_M_HB: | ||
1214 | *gtt_offset = *gtt_size = MB(2); | 1222 | *gtt_offset = *gtt_size = MB(2); |
1215 | break; | 1223 | break; |
1216 | default: | 1224 | default: |
@@ -2186,6 +2194,10 @@ static const struct intel_driver_description { | |||
2186 | "G45/G43", NULL, &intel_i965_driver }, | 2194 | "G45/G43", NULL, &intel_i965_driver }, |
2187 | { PCI_DEVICE_ID_INTEL_G41_HB, PCI_DEVICE_ID_INTEL_G41_IG, 0, | 2195 | { PCI_DEVICE_ID_INTEL_G41_HB, PCI_DEVICE_ID_INTEL_G41_IG, 0, |
2188 | "G41", NULL, &intel_i965_driver }, | 2196 | "G41", NULL, &intel_i965_driver }, |
2197 | { PCI_DEVICE_ID_INTEL_IGDNG_D_HB, PCI_DEVICE_ID_INTEL_IGDNG_D_IG, 0, | ||
2198 | "IGDNG/D", NULL, &intel_i965_driver }, | ||
2199 | { PCI_DEVICE_ID_INTEL_IGDNG_M_HB, PCI_DEVICE_ID_INTEL_IGDNG_M_IG, 0, | ||
2200 | "IGDNG/M", NULL, &intel_i965_driver }, | ||
2189 | { 0, 0, 0, NULL, NULL, NULL } | 2201 | { 0, 0, 0, NULL, NULL, NULL } |
2190 | }; | 2202 | }; |
2191 | 2203 | ||
@@ -2387,6 +2399,8 @@ static struct pci_device_id agp_intel_pci_table[] = { | |||
2387 | ID(PCI_DEVICE_ID_INTEL_Q45_HB), | 2399 | ID(PCI_DEVICE_ID_INTEL_Q45_HB), |
2388 | ID(PCI_DEVICE_ID_INTEL_G45_HB), | 2400 | ID(PCI_DEVICE_ID_INTEL_G45_HB), |
2389 | ID(PCI_DEVICE_ID_INTEL_G41_HB), | 2401 | ID(PCI_DEVICE_ID_INTEL_G41_HB), |
2402 | ID(PCI_DEVICE_ID_INTEL_IGDNG_D_HB), | ||
2403 | ID(PCI_DEVICE_ID_INTEL_IGDNG_M_HB), | ||
2390 | { } | 2404 | { } |
2391 | }; | 2405 | }; |
2392 | 2406 | ||