Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 72021788678523047161e97b3dfed695e802a5fd

Authored by Zhenyu Wang
Committed by Eric Anholt
1 parent 44ab43155e
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

drm/i915: add support for G41 chipset 

This had been delayed for some time due to failure to work on the one piece
of G41 hardware we had, and lack of success reports from anybody else.
Current hardware appears to be OK.

Signed-off-by: Zhenyu Wang <zhenyu.z.wang@intel.com>
[anholt: hand-applied due to conflicts with IGD patches]
Signed-off-by: Eric Anholt <eric@anholt.net>

Showing 2 changed files with 4 additions and 1 deletions Side-by-side Diff

drivers/gpu/drm/i915/i915_drv.h
Diff comments   View file @ 7202178
... ... @@ -787,7 +787,8 @@
787 787 (dev)->pci_device == 0x2A42 || \
788 788 (dev)->pci_device == 0x2E02 || \
789 789 (dev)->pci_device == 0x2E12 || \
790   - (dev)->pci_device == 0x2E22)
  790 + (dev)->pci_device == 0x2E22 || \
  791 + (dev)->pci_device == 0x2E32)
791 792  
792 793 #define IS_I965GM(dev) ((dev)->pci_device == 0x2A02)
793 794  
... ... @@ -796,6 +797,7 @@
796 797 #define IS_G4X(dev) ((dev)->pci_device == 0x2E02 || \
797 798 (dev)->pci_device == 0x2E12 || \
798 799 (dev)->pci_device == 0x2E22 || \
  800 + (dev)->pci_device == 0x2E32 || \
799 801 IS_GM45(dev))
800 802  
801 803 #define IS_IGDG(dev) ((dev)->pci_device == 0xa001)
include/drm/drm_pciids.h
Diff comments   View file @ 7202178
... ... @@ -532,6 +532,7 @@
532 532 {0x8086, 0x2e02, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
533 533 {0x8086, 0x2e12, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
534 534 {0x8086, 0x2e22, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
  535 + {0x8086, 0x2e32, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
535 536 {0x8086, 0xa001, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
536 537 {0x8086, 0xa011, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
537 538 {0x8086, 0x35e8, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \