From 2fc51d5528eda79fe1856e0b85e6b71e3fb79c47 Mon Sep 17 00:00:00 2001 From: Petri Latvala Date: Thu, 25 Apr 2019 16:00:45 +0300 Subject: lib: Add Cometlake platform definition MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit a794f28f01f2 ("lib: sync with the newer i915_pciids.h from the Kernel") added CML PCI IDs but did not update intel_device_info.c Signed-off-by: Petri Latvala Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=110514 Cc: Antonio Argenziano Cc: Anusha Srivatsa Cc: Lucas De Marchi Cc: José Roberto de Souza Acked-by: Antonio Argenziano --- lib/intel_chipset.h | 1 + lib/intel_device_info.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/lib/intel_chipset.h b/lib/intel_chipset.h index 40170b7b..7fc9bd77 100644 --- a/lib/intel_chipset.h +++ b/lib/intel_chipset.h @@ -66,6 +66,7 @@ struct intel_device_info { bool is_kabylake : 1; bool is_geminilake : 1; bool is_coffeelake : 1; + bool is_cometlake : 1; bool is_cannonlake : 1; bool is_icelake : 1; const char *codename; diff --git a/lib/intel_device_info.c b/lib/intel_device_info.c index 2bca5183..3f51211f 100644 --- a/lib/intel_device_info.c +++ b/lib/intel_device_info.c @@ -277,6 +277,21 @@ static const struct intel_device_info intel_coffeelake_gt3_info = { .gt = 3, }; +#define COMETLAKE_FIELDS \ + .gen = BIT(8), \ + .is_cometlake = true, \ + .codename = "cometlake" + +static const struct intel_device_info intel_cometlake_gt1_info = { + COMETLAKE_FIELDS, + .gt = 1, +}; + +static const struct intel_device_info intel_cometlake_gt2_info = { + COMETLAKE_FIELDS, + .gt = 2, +}; + static const struct intel_device_info intel_cannonlake_info = { .gen = BIT(9), .is_cannonlake = true, @@ -360,6 +375,9 @@ static const struct pci_id_match intel_device_match[] = { INTEL_WHL_U_GT3_IDS(&intel_coffeelake_gt3_info), INTEL_AML_CFL_GT2_IDS(&intel_coffeelake_gt2_info), + INTEL_CML_GT1_IDS(&intel_cometlake_gt1_info), + INTEL_CML_GT2_IDS(&intel_cometlake_gt2_info), + INTEL_CNL_IDS(&intel_cannonlake_info), INTEL_ICL_11_IDS(&intel_icelake_info), -- cgit v1.2.3