diff options
author | Zhenyu Wang <zhenyuw@linux.intel.com> | 2009-11-09 22:10:22 -0500 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2009-11-12 14:22:08 -0500 |
commit | 9cf1e35cb025eaa52dde37df38e2750b6adb1620 (patch) | |
tree | 3144be8da58982bcef528bf14fb1aad49812fde3 /drivers/char/agp | |
parent | 5586c8bc93ac5fe75f5fd14e8c7add5344d1c548 (diff) |
agp/intel: new host bridge support
Add new CPU host bridge id, needed for support Ironlake graphics
device with it. No change for graphics device itself, so no need to
update drm/i915.
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/char/agp')
-rw-r--r-- | 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 4068467ce7b9..1d32d5ca5fb0 100644 --- a/drivers/char/agp/intel-agp.c +++ b/drivers/char/agp/intel-agp.c | |||
@@ -62,6 +62,7 @@ | |||
62 | #define PCI_DEVICE_ID_INTEL_IGDNG_D_IG 0x0042 | 62 | #define PCI_DEVICE_ID_INTEL_IGDNG_D_IG 0x0042 |
63 | #define PCI_DEVICE_ID_INTEL_IGDNG_M_HB 0x0044 | 63 | #define PCI_DEVICE_ID_INTEL_IGDNG_M_HB 0x0044 |
64 | #define PCI_DEVICE_ID_INTEL_IGDNG_MA_HB 0x0062 | 64 | #define PCI_DEVICE_ID_INTEL_IGDNG_MA_HB 0x0062 |
65 | #define PCI_DEVICE_ID_INTEL_IGDNG_MC2_HB 0x006a | ||
65 | #define PCI_DEVICE_ID_INTEL_IGDNG_M_IG 0x0046 | 66 | #define PCI_DEVICE_ID_INTEL_IGDNG_M_IG 0x0046 |
66 | 67 | ||
67 | /* cover 915 and 945 variants */ | 68 | /* cover 915 and 945 variants */ |
@@ -96,7 +97,8 @@ | |||
96 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_B43_HB || \ | 97 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_B43_HB || \ |
97 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_IGDNG_D_HB || \ | 98 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_IGDNG_D_HB || \ |
98 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_IGDNG_M_HB || \ | 99 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_IGDNG_M_HB || \ |
99 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_IGDNG_MA_HB) | 100 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_IGDNG_MA_HB || \ |
101 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_IGDNG_MC2_HB) | ||
100 | 102 | ||
101 | extern int agp_memory_reserved; | 103 | extern int agp_memory_reserved; |
102 | 104 | ||
@@ -1364,6 +1366,7 @@ static void intel_i965_get_gtt_range(int *gtt_offset, int *gtt_size) | |||
1364 | case PCI_DEVICE_ID_INTEL_IGDNG_D_HB: | 1366 | case PCI_DEVICE_ID_INTEL_IGDNG_D_HB: |
1365 | case PCI_DEVICE_ID_INTEL_IGDNG_M_HB: | 1367 | case PCI_DEVICE_ID_INTEL_IGDNG_M_HB: |
1366 | case PCI_DEVICE_ID_INTEL_IGDNG_MA_HB: | 1368 | case PCI_DEVICE_ID_INTEL_IGDNG_MA_HB: |
1369 | case PCI_DEVICE_ID_INTEL_IGDNG_MC2_HB: | ||
1367 | *gtt_offset = *gtt_size = MB(2); | 1370 | *gtt_offset = *gtt_size = MB(2); |
1368 | break; | 1371 | break; |
1369 | default: | 1372 | default: |
@@ -2365,6 +2368,8 @@ static const struct intel_driver_description { | |||
2365 | "IGDNG/M", NULL, &intel_i965_driver }, | 2368 | "IGDNG/M", NULL, &intel_i965_driver }, |
2366 | { PCI_DEVICE_ID_INTEL_IGDNG_MA_HB, PCI_DEVICE_ID_INTEL_IGDNG_M_IG, 0, | 2369 | { PCI_DEVICE_ID_INTEL_IGDNG_MA_HB, PCI_DEVICE_ID_INTEL_IGDNG_M_IG, 0, |
2367 | "IGDNG/MA", NULL, &intel_i965_driver }, | 2370 | "IGDNG/MA", NULL, &intel_i965_driver }, |
2371 | { PCI_DEVICE_ID_INTEL_IGDNG_MC2_HB, PCI_DEVICE_ID_INTEL_IGDNG_M_IG, 0, | ||
2372 | "IGDNG/MC2", NULL, &intel_i965_driver }, | ||
2368 | { 0, 0, 0, NULL, NULL, NULL } | 2373 | { 0, 0, 0, NULL, NULL, NULL } |
2369 | }; | 2374 | }; |
2370 | 2375 | ||
@@ -2561,6 +2566,7 @@ static struct pci_device_id agp_intel_pci_table[] = { | |||
2561 | ID(PCI_DEVICE_ID_INTEL_IGDNG_D_HB), | 2566 | ID(PCI_DEVICE_ID_INTEL_IGDNG_D_HB), |
2562 | ID(PCI_DEVICE_ID_INTEL_IGDNG_M_HB), | 2567 | ID(PCI_DEVICE_ID_INTEL_IGDNG_M_HB), |
2563 | ID(PCI_DEVICE_ID_INTEL_IGDNG_MA_HB), | 2568 | ID(PCI_DEVICE_ID_INTEL_IGDNG_MA_HB), |
2569 | ID(PCI_DEVICE_ID_INTEL_IGDNG_MC2_HB), | ||
2564 | { } | 2570 | { } |
2565 | }; | 2571 | }; |
2566 | 2572 | ||