drm/i915: Add first set of DG2 PCI IDs

The IDs added here are the subset reserved for 'motherboard down'
designs of DG2.  We have all the necessary support upstream to enable
these now (although they'll continue to require force_probe until the
usual requirements are met).

The remaining DG2 IDs for add-in cards will come in a future patch once
some additional required functionality has fully landed.

Bspec: 44477
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Dave Airlie <airlied@gmail.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.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/20220425211251.77154-3-matthew.d.roper@intel.com

diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index f59e526b03fc7d0871c05b3b96b1915c6651e195..c88e454a74bba74f6ef07745642ad68ccc86bd29 100644 (file)
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -1056,7 +1056,6 @@ static const struct intel_device_info xehpsdv_info = {
                BIT(VECS0) | BIT(VECS1) | \
                BIT(VCS0) | BIT(VCS2)
 
-__maybe_unused
 static const struct intel_device_info dg2_info = {
        DG2_FEATURES,
        XE_LPD_FEATURES,
@@ -1152,6 +1151,7 @@ static const struct pci_device_id pciidlist[] = {
        INTEL_DG1_IDS(&dg1_info),
        INTEL_RPLS_IDS(&adl_s_info),
        INTEL_RPLP_IDS(&adl_p_info),
+       INTEL_DG2_IDS(&dg2_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 74c3ffb66b8dbe8e23650c961f136dab2ffe5eed..cefa9ed784fffecbb1f1bb8af244528117186c59 100644 (file)
--- a/drivers/gpu/drm/i915/intel_device_info.c
+++ b/drivers/gpu/drm/i915/intel_device_info.c
@@ -186,6 +186,18 @@ static const u16 subplatform_rpl_ids[] = {
        INTEL_RPLP_IDS(0),
 };
 
+static const u16 subplatform_g10_ids[] = {
+       INTEL_DG2_G10_IDS(0),
+};
+
+static const u16 subplatform_g11_ids[] = {
+       INTEL_DG2_G11_IDS(0),
+};
+
+static const u16 subplatform_g12_ids[] = {
+       INTEL_DG2_G12_IDS(0),
+};
+
 static bool find_devid(u16 id, const u16 *p, unsigned int num)
 {
        for (; num; num--, p++) {
@@ -231,6 +243,15 @@ void intel_device_info_subplatform_init(struct drm_i915_private *i915)
        } else if (find_devid(devid, subplatform_rpl_ids,
                              ARRAY_SIZE(subplatform_rpl_ids))) {
                mask = BIT(INTEL_SUBPLATFORM_RPL);
+       } else if (find_devid(devid, subplatform_g10_ids,
+                             ARRAY_SIZE(subplatform_g10_ids))) {
+               mask = BIT(INTEL_SUBPLATFORM_G10);
+       } else if (find_devid(devid, subplatform_g11_ids,
+                             ARRAY_SIZE(subplatform_g11_ids))) {
+               mask = BIT(INTEL_SUBPLATFORM_G11);
+       } else if (find_devid(devid, subplatform_g12_ids,
+                             ARRAY_SIZE(subplatform_g12_ids))) {
+               mask = BIT(INTEL_SUBPLATFORM_G12);
        }
 
        GEM_BUG_ON(mask & ~INTEL_SUBPLATFORM_MASK);

diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
index a7b5eea7ffaa9567aa78ddd74ae2745cd9338da7..283dadfbb4db7c1668d068e168bbae523af81885 100644 (file)
--- a/include/drm/i915_pciids.h
+++ b/include/drm/i915_pciids.h
@@ -692,4 +692,26 @@
        INTEL_VGA_DEVICE(0xA7A8, info), \
        INTEL_VGA_DEVICE(0xA7A9, info)
 
+/* DG2 */
+#define INTEL_DG2_G10_IDS(info) \
+       INTEL_VGA_DEVICE(0x5690, info), \
+       INTEL_VGA_DEVICE(0x5691, info), \
+       INTEL_VGA_DEVICE(0x5692, 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)
+
+#define INTEL_DG2_G12_IDS(info) \
+       INTEL_VGA_DEVICE(0x5696, info), \
+       INTEL_VGA_DEVICE(0x5697, info), \
+       INTEL_VGA_DEVICE(0x56B2, info)
+
+#define INTEL_DG2_IDS(info) \
+       INTEL_DG2_G10_IDS(info), \
+       INTEL_DG2_G11_IDS(info), \
+       INTEL_DG2_G12_IDS(info)
+
 #endif /* _I915_PCIIDS_H */