Commit 8618b848 authored by Matt Roper's avatar Matt Roper

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: 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/20220701152231.529511-2-matthew.d.roper@intel.com
parent 3b05c960
...@@ -1079,7 +1079,6 @@ static const struct intel_device_info dg2_info = { ...@@ -1079,7 +1079,6 @@ static const struct intel_device_info dg2_info = {
.require_force_probe = 1, .require_force_probe = 1,
}; };
__maybe_unused
static const struct intel_device_info ats_m_info = { static const struct intel_device_info ats_m_info = {
DG2_FEATURES, DG2_FEATURES,
.display = { 0 }, .display = { 0 },
...@@ -1193,6 +1192,7 @@ static const struct pci_device_id pciidlist[] = { ...@@ -1193,6 +1192,7 @@ static const struct pci_device_id pciidlist[] = {
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), INTEL_DG2_IDS(&dg2_info),
INTEL_ATS_M_IDS(&ats_m_info),
{0, 0, 0} {0, 0, 0}
}; };
MODULE_DEVICE_TABLE(pci, pciidlist); MODULE_DEVICE_TABLE(pci, pciidlist);
......
...@@ -189,10 +189,12 @@ static const u16 subplatform_rpl_ids[] = { ...@@ -189,10 +189,12 @@ static const u16 subplatform_rpl_ids[] = {
static const u16 subplatform_g10_ids[] = { static const u16 subplatform_g10_ids[] = {
INTEL_DG2_G10_IDS(0), INTEL_DG2_G10_IDS(0),
INTEL_ATS_M150_IDS(0),
}; };
static const u16 subplatform_g11_ids[] = { static const u16 subplatform_g11_ids[] = {
INTEL_DG2_G11_IDS(0), INTEL_DG2_G11_IDS(0),
INTEL_ATS_M75_IDS(0),
}; };
static const u16 subplatform_g12_ids[] = { static const u16 subplatform_g12_ids[] = {
......
...@@ -696,22 +696,42 @@ ...@@ -696,22 +696,42 @@
#define INTEL_DG2_G10_IDS(info) \ #define INTEL_DG2_G10_IDS(info) \
INTEL_VGA_DEVICE(0x5690, info), \ INTEL_VGA_DEVICE(0x5690, info), \
INTEL_VGA_DEVICE(0x5691, 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) \ #define INTEL_DG2_G11_IDS(info) \
INTEL_VGA_DEVICE(0x5693, info), \ INTEL_VGA_DEVICE(0x5693, info), \
INTEL_VGA_DEVICE(0x5694, info), \ INTEL_VGA_DEVICE(0x5694, info), \
INTEL_VGA_DEVICE(0x5695, 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) \ #define INTEL_DG2_G12_IDS(info) \
INTEL_VGA_DEVICE(0x5696, info), \ INTEL_VGA_DEVICE(0x5696, info), \
INTEL_VGA_DEVICE(0x5697, 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) \ #define INTEL_DG2_IDS(info) \
INTEL_DG2_G10_IDS(info), \ INTEL_DG2_G10_IDS(info), \
INTEL_DG2_G11_IDS(info), \ INTEL_DG2_G11_IDS(info), \
INTEL_DG2_G12_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 */ #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