aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabian Henze <hoacha@quantentunnel.de>2009-09-07 12:59:59 -0400
committerEric Anholt <eric@anholt.net>2009-09-09 02:33:26 -0400
commit7839c5d5519b6d9e2ccf3cdbf1c39e3817ad0835 (patch)
tree6cdb6bf350ee669c752c3deabbfdedff5de069c0
parent38d8a95621b20ed7868e232a35a26ee61bdcae6f (diff)
drm/i915: add B43 chipset support
Signed-off-by: Fabian Henze <hoacha@quantentunnel.de> Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com> Signed-off-by: Eric Anholt <eric@anholt.net>
-rw-r--r--drivers/gpu/drm/i915/i915_drv.h2
-rw-r--r--include/drm/drm_pciids.h1
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 77ed060b4292..e5f20e40ac59 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -863,6 +863,7 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
863 (dev)->pci_device == 0x2E12 || \ 863 (dev)->pci_device == 0x2E12 || \
864 (dev)->pci_device == 0x2E22 || \ 864 (dev)->pci_device == 0x2E22 || \
865 (dev)->pci_device == 0x2E32 || \ 865 (dev)->pci_device == 0x2E32 || \
866 (dev)->pci_device == 0x2E42 || \
866 (dev)->pci_device == 0x0042 || \ 867 (dev)->pci_device == 0x0042 || \
867 (dev)->pci_device == 0x0046) 868 (dev)->pci_device == 0x0046)
868 869
@@ -875,6 +876,7 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
875 (dev)->pci_device == 0x2E12 || \ 876 (dev)->pci_device == 0x2E12 || \
876 (dev)->pci_device == 0x2E22 || \ 877 (dev)->pci_device == 0x2E22 || \
877 (dev)->pci_device == 0x2E32 || \ 878 (dev)->pci_device == 0x2E32 || \
879 (dev)->pci_device == 0x2E42 || \
878 IS_GM45(dev)) 880 IS_GM45(dev))
879 881
880#define IS_IGDG(dev) ((dev)->pci_device == 0xa001) 882#define IS_IGDG(dev) ((dev)->pci_device == 0xa001)
diff --git a/include/drm/drm_pciids.h b/include/drm/drm_pciids.h
index 853508499d20..3f6e545609be 100644
--- a/include/drm/drm_pciids.h
+++ b/include/drm/drm_pciids.h
@@ -552,6 +552,7 @@
552 {0x8086, 0x2e12, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \ 552 {0x8086, 0x2e12, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
553 {0x8086, 0x2e22, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \ 553 {0x8086, 0x2e22, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
554 {0x8086, 0x2e32, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \ 554 {0x8086, 0x2e32, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
555 {0x8086, 0x2e42, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
555 {0x8086, 0xa001, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \ 556 {0x8086, 0xa001, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
556 {0x8086, 0xa011, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \ 557 {0x8086, 0xa011, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
557 {0x8086, 0x35e8, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \ 558 {0x8086, 0x35e8, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \