Merge tag 'drm-intel-gt-next-2022-07-13' of git://anongit.freedesktop.org/drm/drm...

[linux-block.git] / drivers / gpu / drm / i915 / i915_pci.c

diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index 5edc8fbf1dff7c5ede694317b89f26134a378f2d..aacc10f2e73f45e715134b211035379306349f78 100644 (file)
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -1075,7 +1075,6 @@ static const struct intel_device_info dg2_info = {
        .require_force_probe = 1,
 };
 
-__maybe_unused
 static const struct intel_device_info ats_m_info = {
        DG2_FEATURES,
        .display = { 0 },
@@ -1108,6 +1107,31 @@ static const struct intel_device_info pvc_info = {
        .require_force_probe = 1,
 };
 
+#define XE_LPDP_FEATURES       \
+       XE_LPD_FEATURES,        \
+       .display.ver = 14,      \
+       .display.has_cdclk_crawl = 1
+
+__maybe_unused
+static const struct intel_device_info mtl_info = {
+       XE_HP_FEATURES,
+       XE_LPDP_FEATURES,
+       /*
+        * Real graphics IP version will be obtained from hardware GMD_ID
+        * register.  Value provided here is just for sanity checking.
+        */
+       .graphics.ver = 12,
+       .graphics.rel = 70,
+       .media.ver = 13,
+       PLATFORM(INTEL_METEORLAKE),
+       .display.has_modular_fia = 1,
+       .has_flat_ccs = 0,
+       .has_snoop = 1,
+       .memory_regions = REGION_SMEM | REGION_STOLEN_LMEM,
+       .platform_engine_mask = BIT(RCS0) | BIT(BCS0) | BIT(CCS0),
+       .require_force_probe = 1,
+};
+
 #undef PLATFORM
 
 /*
@@ -1189,6 +1213,8 @@ static const struct pci_device_id pciidlist[] = {
        INTEL_RPLS_IDS(&adl_s_info),
        INTEL_RPLP_IDS(&adl_p_info),
        INTEL_DG2_IDS(&dg2_info),
+       INTEL_ATS_M_IDS(&ats_m_info),
+       INTEL_MTL_IDS(&mtl_info),
        {0, 0, 0}
 };
 MODULE_DEVICE_TABLE(pci, pciidlist);