xf86-video-intel: 2 commits - src/i915_pciids.h src/intel_module.c

[Chris Wilson]

 src/i915_pciids.h  |   10 ++++++++++
 src/intel_module.c |    8 ++++++++
 2 files changed, 18 insertions(+)

New commits:
commit e7bfc9065345085f767235eea8b148c356e5bd2b
Author: Liwei Song <liwei.song at windriver.com>
Date:   Thu Mar 15 23:14:18 2018 -0400

    Add Coffeelake PCI IDs for U Skus
    
    Add the Coffeelake PCI IDs based on the following kernel patch:
    
    commit d29fe702c9cb682df99146d24d06e5455f043101
    Author: Anusha Srivatsa <anusha.srivatsa at intel.com>
    Date:   Thu Jun 8 16:41:07 2017 -0700
    
        drm/i915/cfl: Add Coffee Lake PCI IDs for U Sku.
    
    Signed-off-by: Liwei Song <liwei.song at windriver.com>

diff --git a/src/i915_pciids.h b/src/i915_pciids.h
index 31f94f86..aadd4152 100644
--- a/src/i915_pciids.h
+++ b/src/i915_pciids.h
@@ -337,4 +337,10 @@
 	INTEL_VGA_DEVICE(0x3E9B, info), /* Halo GT2 */ \
 	INTEL_VGA_DEVICE(0x3E94, info)  /* Halo GT2 */
 
+#define INTEL_CFL_U_IDS(info) \
+	INTEL_VGA_DEVICE(0x3EA6, info), /* ULT GT3 */ \
+	INTEL_VGA_DEVICE(0x3EA7, info), /* ULT GT3 */ \
+	INTEL_VGA_DEVICE(0x3EA8, info), /* ULT GT3 */ \
+	INTEL_VGA_DEVICE(0x3EA5, info)  /* ULT GT3 */
+
 #endif /* _I915_PCIIDS_H */
diff --git a/src/intel_module.c b/src/intel_module.c
index 1691bea3..3ecc27ea 100644
--- a/src/intel_module.c
+++ b/src/intel_module.c
@@ -315,6 +315,10 @@ static const SymTabRec intel_chipsets[] = {
 	{0x3E96, "HD Graphics"},
 	{0x3E9B, "HD Graphics"},
 	{0x3E94, "HD Graphics"},
+	{0x3EA5, "HD Graphics"},
+	{0x3EA6, "HD Graphics"},
+	{0x3EA7, "HD Graphics"},
+	{0x3EA8, "HD Graphics"},
 
 	/* When adding new identifiers, also update:
 	 * 1. intel_identify()
@@ -373,6 +377,7 @@ static const struct pci_id_match intel_device_match[] = {
 
 	INTEL_CFL_S_IDS(&intel_coffeelake_info),
 	INTEL_CFL_H_IDS(&intel_coffeelake_info),
+	INTEL_CFL_U_IDS(&intel_coffeelake_info),
 
 	INTEL_VGA_DEVICE(PCI_MATCH_ANY, &intel_generic_info),
 #endif
commit 8b90ab0434ebc69d45001701a0fdd8db795bf051
Author: Liwei Song <liwei.song at windriver.com>
Date:   Thu Mar 15 23:14:17 2018 -0400

    Add Coffeelake PCI IDs for H Skus
    
    Add the Coffeelake PCI IDs based on the following kernel patches:
    
    commit ccfd13215fd25a0e8c28221f3acc0dcaec11cd15
    Author: Anusha Srivatsa <anusha.srivatsa at intel.com>
    Date:   Thu Jun 8 16:41:06 2017 -0700
    
        drm/i915/cfl: Add Coffee Lake PCI IDs for H Sku.
    
    Signed-off-by: Liwei Song <liwei.song at windriver.com>

diff --git a/src/i915_pciids.h b/src/i915_pciids.h
index 77b200f4..31f94f86 100644
--- a/src/i915_pciids.h
+++ b/src/i915_pciids.h
@@ -333,4 +333,8 @@
 	INTEL_VGA_DEVICE(0x3E92, info), /* SRV GT2 */ \
 	INTEL_VGA_DEVICE(0x3E96, info)  /* SRV GT2 */
 
+#define INTEL_CFL_H_IDS(info) \
+	INTEL_VGA_DEVICE(0x3E9B, info), /* Halo GT2 */ \
+	INTEL_VGA_DEVICE(0x3E94, info)  /* Halo GT2 */
+
 #endif /* _I915_PCIIDS_H */
diff --git a/src/intel_module.c b/src/intel_module.c
index ffbd1923..1691bea3 100644
--- a/src/intel_module.c
+++ b/src/intel_module.c
@@ -313,6 +313,8 @@ static const SymTabRec intel_chipsets[] = {
 	{0x3E91, "HD Graphics"},
 	{0x3E92, "HD Graphics"},
 	{0x3E96, "HD Graphics"},
+	{0x3E9B, "HD Graphics"},
+	{0x3E94, "HD Graphics"},
 
 	/* When adding new identifiers, also update:
 	 * 1. intel_identify()
@@ -370,6 +372,7 @@ static const struct pci_id_match intel_device_match[] = {
 	INTEL_GLK_IDS(&intel_geminilake_info),
 
 	INTEL_CFL_S_IDS(&intel_coffeelake_info),
+	INTEL_CFL_H_IDS(&intel_coffeelake_info),
 
 	INTEL_VGA_DEVICE(PCI_MATCH_ANY, &intel_generic_info),
 #endif