Commit 1bc4ae0c authored by Matt Roper's avatar Matt Roper

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: default avatarMatt Roper <matthew.d.roper@intel.com>
Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220425211251.77154-3-matthew.d.roper@intel.com
parent eddbb074
...@@ -1056,7 +1056,6 @@ static const struct intel_device_info xehpsdv_info = { ...@@ -1056,7 +1056,6 @@ static const struct intel_device_info xehpsdv_info = {
BIT(VECS0) | BIT(VECS1) | \ BIT(VECS0) | BIT(VECS1) | \
BIT(VCS0) | BIT(VCS2) BIT(VCS0) | BIT(VCS2)
__maybe_unused
static const struct intel_device_info dg2_info = { static const struct intel_device_info dg2_info = {
DG2_FEATURES, DG2_FEATURES,
XE_LPD_FEATURES, XE_LPD_FEATURES,
...@@ -1152,6 +1151,7 @@ static const struct pci_device_id pciidlist[] = { ...@@ -1152,6 +1151,7 @@ static const struct pci_device_id pciidlist[] = {
INTEL_DG1_IDS(&dg1_info), INTEL_DG1_IDS(&dg1_info),
INTEL_RPLS_IDS(&adl_s_info), INTEL_RPLS_IDS(&adl_s_info),
INTEL_RPLP_IDS(&adl_p_info), INTEL_RPLP_IDS(&adl_p_info),
INTEL_DG2_IDS(&dg2_info),
{0, 0, 0} {0, 0, 0}
}; };
MODULE_DEVICE_TABLE(pci, pciidlist); MODULE_DEVICE_TABLE(pci, pciidlist);
......
...@@ -186,6 +186,18 @@ static const u16 subplatform_rpl_ids[] = { ...@@ -186,6 +186,18 @@ static const u16 subplatform_rpl_ids[] = {
INTEL_RPLP_IDS(0), 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) static bool find_devid(u16 id, const u16 *p, unsigned int num)
{ {
for (; num; num--, p++) { for (; num; num--, p++) {
...@@ -231,6 +243,15 @@ void intel_device_info_subplatform_init(struct drm_i915_private *i915) ...@@ -231,6 +243,15 @@ void intel_device_info_subplatform_init(struct drm_i915_private *i915)
} else if (find_devid(devid, subplatform_rpl_ids, } else if (find_devid(devid, subplatform_rpl_ids,
ARRAY_SIZE(subplatform_rpl_ids))) { ARRAY_SIZE(subplatform_rpl_ids))) {
mask = BIT(INTEL_SUBPLATFORM_RPL); 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); GEM_BUG_ON(mask & ~INTEL_SUBPLATFORM_MASK);
......
...@@ -692,4 +692,26 @@ ...@@ -692,4 +692,26 @@
INTEL_VGA_DEVICE(0xA7A8, info), \ INTEL_VGA_DEVICE(0xA7A8, info), \
INTEL_VGA_DEVICE(0xA7A9, 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 */ #endif /* _I915_PCIIDS_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment