drm/i915: DG2 and ATS-M device ID updates

Small BAR support has now landed, which allows us to add the PCI IDs
that correspond to add-in card designs of DG2 and ATS-M.  There's also
one additional MB-down PCI ID that recently appeared (0x5698) so we add
it too.

Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220701152231.529511-2-matthew.d.roper@intel.com

diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index d6d875b2d3799dec9183e35a8759496cb02a9b94..5e51fc29bb8ba387e809974fe0c73d1c80a75404 100644 (file)
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -1079,7 +1079,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 },
@@ -1193,6 +1192,7 @@ 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),
        {0, 0, 0}
 };
 MODULE_DEVICE_TABLE(pci, pciidlist);

diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
index 7eb89366659597a06727d645125b41a16f21ac10..f0bf23726ed8f667be8b823f7e5d01ad9672811b 100644 (file)
--- a/drivers/gpu/drm/i915/intel_device_info.c
+++ b/drivers/gpu/drm/i915/intel_device_info.c
@@ -189,10 +189,12 @@ static const u16 subplatform_rpl_ids[] = {
 
 static const u16 subplatform_g10_ids[] = {
        INTEL_DG2_G10_IDS(0),
+       INTEL_ATS_M150_IDS(0),
 };
 
 static const u16 subplatform_g11_ids[] = {
        INTEL_DG2_G11_IDS(0),
+       INTEL_ATS_M75_IDS(0),
 };
 
 static const u16 subplatform_g12_ids[] = {

diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
index 283dadfbb4db7c1668d068e168bbae523af81885..1bd0420a213d792c2438c83196f46240029e019f 100644 (file)
--- a/include/drm/i915_pciids.h
+++ b/include/drm/i915_pciids.h
@@ -696,22 +696,42 @@
 #define INTEL_DG2_G10_IDS(info) \
        INTEL_VGA_DEVICE(0x5690, info), \
        INTEL_VGA_DEVICE(0x5691, info), \
-       INTEL_VGA_DEVICE(0x5692, info)
+       INTEL_VGA_DEVICE(0x5692, info), \
+       INTEL_VGA_DEVICE(0x56A0, info), \
+       INTEL_VGA_DEVICE(0x56A1, info), \
+       INTEL_VGA_DEVICE(0x56A2, info)
 
 #define INTEL_DG2_G11_IDS(info) \
        INTEL_VGA_DEVICE(0x5693, info), \
        INTEL_VGA_DEVICE(0x5694, info), \
        INTEL_VGA_DEVICE(0x5695, info), \
-       INTEL_VGA_DEVICE(0x56B0, info)
+       INTEL_VGA_DEVICE(0x5698, info), \
+       INTEL_VGA_DEVICE(0x56A5, info), \
+       INTEL_VGA_DEVICE(0x56A6, info), \
+       INTEL_VGA_DEVICE(0x56B0, info), \
+       INTEL_VGA_DEVICE(0x56B1, info)
 
 #define INTEL_DG2_G12_IDS(info) \
        INTEL_VGA_DEVICE(0x5696, info), \
        INTEL_VGA_DEVICE(0x5697, info), \
-       INTEL_VGA_DEVICE(0x56B2, info)
+       INTEL_VGA_DEVICE(0x56A3, info), \
+       INTEL_VGA_DEVICE(0x56A4, info), \
+       INTEL_VGA_DEVICE(0x56B2, info), \
+       INTEL_VGA_DEVICE(0x56B3, info)
 
 #define INTEL_DG2_IDS(info) \
        INTEL_DG2_G10_IDS(info), \
        INTEL_DG2_G11_IDS(info), \
        INTEL_DG2_G12_IDS(info)
 
+#define INTEL_ATS_M150_IDS(info) \
+       INTEL_VGA_DEVICE(0x56C0, info)
+
+#define INTEL_ATS_M75_IDS(info) \
+       INTEL_VGA_DEVICE(0x56C1, info)
+
+#define INTEL_ATS_M_IDS(info) \
+       INTEL_ATS_M150_IDS(info), \
+       INTEL_ATS_M75_IDS(info)
+
 #endif /* _I915_PCIIDS_H */