Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 1 | From 96d4e8e7b8a699f0ef77fa7b210d4de5f1c703d0 Mon Sep 17 00:00:00 2001 |
| 2 | From: Liwei Song <liwei.song@windriver.com> |
| 3 | Date: Wed, 22 Nov 2017 08:59:03 +0000 |
| 4 | Subject: [PATCH] Add Coffeelake PCI IDs for S Skus |
| 5 | |
| 6 | Add the Coffeelake PCI IDs based on the following kernel patches: |
| 7 | |
| 8 | commit b056f8f3d6b900e8afd19f312719160346d263b4 |
| 9 | Author: Anusha Srivatsa <anusha.srivatsa@intel.com> |
| 10 | Date: Thu Jun 8 16:41:05 2017 -0700 |
| 11 | |
| 12 | drm/i915/cfl: Add Coffee Lake PCI IDs for S Skus. |
| 13 | |
| 14 | Upstream-Status: Submitted [https://patchwork.kernel.org/patch/10139905] |
| 15 | |
| 16 | Signed-off-by: Liwei Song <liwei.song@windriver.com> |
| 17 | --- |
| 18 | src/i915_pciids.h | 7 +++++++ |
| 19 | src/intel_module.c | 13 +++++++++++++ |
| 20 | src/sna/gen9_render.c | 12 ++++++++++++ |
| 21 | 3 files changed, 32 insertions(+) |
| 22 | |
| 23 | diff --git a/src/i915_pciids.h b/src/i915_pciids.h |
| 24 | index 0370f830c541..11ccfa9c047a 100644 |
| 25 | --- a/src/i915_pciids.h |
| 26 | +++ b/src/i915_pciids.h |
| 27 | @@ -340,4 +340,11 @@ |
| 28 | INTEL_VGA_DEVICE(0x3184, info), \ |
| 29 | INTEL_VGA_DEVICE(0x3185, info) |
| 30 | |
| 31 | +#define INTEL_CFL_S_IDS(info) \ |
| 32 | + INTEL_VGA_DEVICE(0x3E90, info), /* SRV GT1 */ \ |
| 33 | + INTEL_VGA_DEVICE(0x3E93, info), /* SRV GT1 */ \ |
| 34 | + INTEL_VGA_DEVICE(0x3E91, info), /* SRV GT2 */ \ |
| 35 | + INTEL_VGA_DEVICE(0x3E92, info), /* SRV GT2 */ \ |
| 36 | + INTEL_VGA_DEVICE(0x3E96, info) /* SRV GT2 */ |
| 37 | + |
| 38 | #endif /* _I915_PCIIDS_H */ |
| 39 | diff --git a/src/intel_module.c b/src/intel_module.c |
| 40 | index 6b04857e2853..4827a67255f0 100644 |
| 41 | --- a/src/intel_module.c |
| 42 | +++ b/src/intel_module.c |
| 43 | @@ -138,6 +138,10 @@ static const struct intel_device_info intel_geminilake_info = { |
| 44 | .gen = 0113, |
| 45 | }; |
| 46 | |
| 47 | +static const struct intel_device_info intel_coffeelake_info = { |
| 48 | + .gen = 0114, |
| 49 | +}; |
| 50 | + |
| 51 | static const SymTabRec intel_chipsets[] = { |
| 52 | {PCI_CHIP_I810, "i810"}, |
| 53 | {PCI_CHIP_I810_DC100, "i810-dc100"}, |
| 54 | @@ -303,6 +307,13 @@ static const SymTabRec intel_chipsets[] = { |
| 55 | {0x5916, "HD Graphics 620"}, |
| 56 | {0x591E, "HD Graphics 615"}, |
| 57 | |
| 58 | + /*Coffeelake*/ |
| 59 | + {0x3E90, "HD Graphics"}, |
| 60 | + {0x3E93, "HD Graphics"}, |
| 61 | + {0x3E91, "HD Graphics"}, |
| 62 | + {0x3E92, "HD Graphics"}, |
| 63 | + {0x3E96, "HD Graphics"}, |
| 64 | + |
| 65 | /* When adding new identifiers, also update: |
| 66 | * 1. intel_identify() |
| 67 | * 2. man/intel.man |
| 68 | @@ -368,6 +379,8 @@ static const struct pci_id_match intel_device_match[] = { |
| 69 | |
| 70 | INTEL_GLK_IDS(&intel_geminilake_info), |
| 71 | |
| 72 | + INTEL_CFL_S_IDS(&intel_coffeelake_info), |
| 73 | + |
| 74 | INTEL_VGA_DEVICE(PCI_MATCH_ANY, &intel_generic_info), |
| 75 | #endif |
| 76 | |
| 77 | diff --git a/src/sna/gen9_render.c b/src/sna/gen9_render.c |
| 78 | index e5f12c723956..7f49052c5ec1 100644 |
| 79 | --- a/src/sna/gen9_render.c |
| 80 | +++ b/src/sna/gen9_render.c |
| 81 | @@ -245,6 +245,11 @@ static const struct gt_info glk_gt_info = { |
| 82 | .urb = { .max_vs_entries = 320 }, |
| 83 | }; |
| 84 | |
| 85 | +static const struct gt_info cfl_gt_info = { |
| 86 | + .name = "Coffeelake (gen9)", |
| 87 | + .urb = { .max_vs_entries = 960 }, |
| 88 | +}; |
| 89 | + |
| 90 | static bool is_skl(struct sna *sna) |
| 91 | { |
| 92 | return sna->kgem.gen == 0110; |
| 93 | @@ -265,6 +270,11 @@ static bool is_glk(struct sna *sna) |
| 94 | return sna->kgem.gen == 0113; |
| 95 | } |
| 96 | |
| 97 | +static bool is_cfl(struct sna *sna) |
| 98 | +{ |
| 99 | + return sna->kgem.gen == 0114; |
| 100 | +} |
| 101 | + |
| 102 | |
| 103 | static inline bool too_large(int width, int height) |
| 104 | { |
| 105 | @@ -4040,6 +4050,8 @@ static bool gen9_render_setup(struct sna *sna) |
| 106 | state->info = &kbl_gt_info; |
| 107 | if (is_glk(sna)) |
| 108 | state->info = &glk_gt_info; |
| 109 | + if (is_cfl(sna)) |
| 110 | + state->info = &cfl_gt_info; |
| 111 | |
| 112 | sna_static_stream_init(&general); |
| 113 | |
| 114 | -- |
| 115 | 2.13.3 |
| 116 | |