drm: Branch 'master'

[email protected] (Ben Widawsky)
Newsgroups gmane.comp.video.dri.patches
Message-ID <[email protected]>
 intel/intel_chipset.h |   13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 3e81f8b7b974c66915ea1bbc43d5c613c97e72c1
Author: Ben Widawsky <[email protected]>
Date:   Thu Nov 10 10:28:02 2016 -0800

    intel: Add Geminilake PCI IDs
    
    Signed-off-by: Ben Widawsky <[email protected]>
    Reviewed-by: Anuj Phogat <[email protected]>

diff --git a/intel/intel_chipset.h b/intel/intel_chipset.h
index 514f659..41fc0da 100644
--- a/intel/intel_chipset.h
+++ b/intel/intel_chipset.h
@@ -218,6 +218,9 @@
 #define PCI_CHIP_BROXTON_3		0x1A85
 #define PCI_CHIP_BROXTON_4		0x5A85
 
+#define PCI_CHIP_GLK			0x3184
+#define PCI_CHIP_GLK_2X6		0x3185
+
 #define IS_MOBILE(devid)	((devid) == PCI_CHIP_I855_GM || \
 				 (devid) == PCI_CHIP_I915_GM || \
 				 (devid) == PCI_CHIP_I945_GM || \
@@ -446,9 +449,13 @@
 				 (devid) == PCI_CHIP_BROXTON_3	|| \
 				 (devid) == PCI_CHIP_BROXTON_4)
 
-#define IS_GEN9(devid)		(IS_SKYLAKE(devid) || \
-				 IS_BROXTON(devid) || \
-				 IS_KABYLAKE(devid))
+#define IS_GEMINILAKE(devid)	((devid) == PCI_CHIP_GLK || \
+				 (devid) == PCI_CHIP_GLK_2X6)
+
+#define IS_GEN9(devid)		(IS_SKYLAKE(devid)  || \
+				 IS_BROXTON(devid)  || \
+				 IS_KABYLAKE(devid) || \
+				 IS_GEMINILAKE(devid))
 
 #define IS_9XX(dev)		(IS_GEN3(dev) || \
 				 IS_GEN4(dev) || \

------------------------------------------------------------------------------
--
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.