summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiwei Song <liwei.song@windriver.com>2017-12-29 03:23:17 -0500
committerChris Wilson <chris@chris-wilson.co.uk>2018-01-11 07:52:21 +0000
commit26f5406841f3924f23f29df61b5ea53d2816b665 (patch)
tree2775ae91ebf581e5c2ff2560464201e87ac9f31a
parent708255cbca83dbafe9154c39bd4553b0b81f09cf (diff)
Add Coffeelake PCI IDs for S Skus
Add the Coffeelake PCI IDs based on the following kernel patches: commit b056f8f3d6b900e8afd19f312719160346d263b4 Author: Anusha Srivatsa <anusha.srivatsa@intel.com> Date: Thu Jun 8 16:41:05 2017 -0700 drm/i915/cfl: Add Coffee Lake PCI IDs for S Skus. Signed-off-by: Liwei Song <liwei.song@windriver.com> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--src/i915_pciids.h7
-rw-r--r--src/intel_module.c13
-rw-r--r--src/sna/gen9_render.c11
3 files changed, 31 insertions, 0 deletions
diff --git a/src/i915_pciids.h b/src/i915_pciids.h
index 466c7159..77b200f4 100644
--- a/src/i915_pciids.h
+++ b/src/i915_pciids.h
@@ -326,4 +326,11 @@
INTEL_KBL_GT3_IDS(info), \
INTEL_KBL_GT4_IDS(info)
+#define INTEL_CFL_S_IDS(info) \
+ INTEL_VGA_DEVICE(0x3E90, info), /* SRV GT1 */ \
+ INTEL_VGA_DEVICE(0x3E93, info), /* SRV GT1 */ \
+ INTEL_VGA_DEVICE(0x3E91, info), /* SRV GT2 */ \
+ INTEL_VGA_DEVICE(0x3E92, info), /* SRV GT2 */ \
+ INTEL_VGA_DEVICE(0x3E96, info) /* SRV GT2 */
+
#endif /* _I915_PCIIDS_H */
diff --git a/src/intel_module.c b/src/intel_module.c
index 2e97b5ea..ffbd1923 100644
--- a/src/intel_module.c
+++ b/src/intel_module.c
@@ -138,6 +138,10 @@ static const struct intel_device_info intel_geminilake_info = {
.gen = 0113,
};
+static const struct intel_device_info intel_coffeelake_info = {
+ .gen = 0114,
+};
+
static const SymTabRec intel_chipsets[] = {
{PCI_CHIP_I810, "i810"},
{PCI_CHIP_I810_DC100, "i810-dc100"},
@@ -303,6 +307,13 @@ static const SymTabRec intel_chipsets[] = {
{0x5916, "HD Graphics 620"},
{0x591E, "HD Graphics 615"},
+ /*Coffeelake*/
+ {0x3E90, "HD Graphics"},
+ {0x3E93, "HD Graphics"},
+ {0x3E91, "HD Graphics"},
+ {0x3E92, "HD Graphics"},
+ {0x3E96, "HD Graphics"},
+
/* When adding new identifiers, also update:
* 1. intel_identify()
* 2. man/intel.man
@@ -358,6 +369,8 @@ static const struct pci_id_match intel_device_match[] = {
INTEL_KBL_IDS(&intel_kabylake_info),
INTEL_GLK_IDS(&intel_geminilake_info),
+ INTEL_CFL_S_IDS(&intel_coffeelake_info),
+
INTEL_VGA_DEVICE(PCI_MATCH_ANY, &intel_generic_info),
#endif
diff --git a/src/sna/gen9_render.c b/src/sna/gen9_render.c
index 68ac1438..82ff4e27 100644
--- a/src/sna/gen9_render.c
+++ b/src/sna/gen9_render.c
@@ -253,6 +253,11 @@ static const struct gt_info glk_gt_info = {
.urb = { .max_vs_entries = 320 },
};
+static const struct gt_info cfl_gt_info = {
+ .name = "Coffeelake (gen9)",
+ .urb = { .max_vs_entries = 960 },
+};
+
static bool is_skl(struct sna *sna)
{
return sna->kgem.gen == 0110;
@@ -273,6 +278,10 @@ static bool is_glk(struct sna *sna)
return sna->kgem.gen == 0113;
}
+static bool is_cfl(struct sna *sna)
+{
+ return sna->kgem.gen == 0114;
+}
static inline bool too_large(int width, int height)
{
@@ -4056,6 +4065,8 @@ static bool gen9_render_setup(struct sna *sna)
state->info = &kbl_gt_info;
if (is_glk(sna))
state->info = &glk_gt_info;
+ if (is_cfl(sna))
+ state->info = &cfl_gt_info;
sna_static_stream_init(&general);