diff options
| author | Tomi Valkeinen <tomi.valkeinen@ideasonboard.com> | 2024-04-27 10:27:35 +0300 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ideasonboard.com> | 2024-04-27 10:27:35 +0300 |
| commit | a73b5b865b9fa27a101ea5216d006b0f2c86eda8 (patch) | |
| tree | 2c1313856d63e9ab68c14af5a4f1f002543b0758 | |
| parent | 6962e820c1be726c385fcf4b7356810b48d0e82d (diff) | |
| parent | bfcec151e1e732849facec2e6ac23edc0c7f20ba (diff) | |
Merge remote-tracking branch 'drm-xe/topic/xe-for-CI' into drm-tip
| -rw-r--r-- | drivers/gpu/drm/xe/xe_pci.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/xe/xe_uc_fw.c | 5 | ||||
| -rw-r--r-- | include/drm/xe_pciids.h | 16 |
3 files changed, 22 insertions, 2 deletions
diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c index f326dbb1cecd..a0cf5dd803c2 100644 --- a/drivers/gpu/drm/xe/xe_pci.c +++ b/drivers/gpu/drm/xe/xe_pci.c @@ -317,7 +317,7 @@ static const struct xe_device_desc dg2_desc = { .has_display = true, }; -static const __maybe_unused struct xe_device_desc pvc_desc = { +static const struct xe_device_desc pvc_desc = { .graphics = &graphics_xehpc, DGFX_FEATURES, PLATFORM(XE_PVC), @@ -386,6 +386,7 @@ static const struct pci_device_id pciidlist[] = { XE_DG1_IDS(INTEL_VGA_DEVICE, &dg1_desc), XE_ATS_M_IDS(INTEL_VGA_DEVICE, &ats_m_desc), XE_DG2_IDS(INTEL_VGA_DEVICE, &dg2_desc), + XE_PVC_IDS(INTEL_VGA_DEVICE, &pvc_desc), XE_MTL_IDS(INTEL_VGA_DEVICE, &mtl_desc), XE_LNL_IDS(INTEL_VGA_DEVICE, &lnl_desc), { } diff --git a/drivers/gpu/drm/xe/xe_uc_fw.c b/drivers/gpu/drm/xe/xe_uc_fw.c index 186f81640cef..ed819f1df888 100644 --- a/drivers/gpu/drm/xe/xe_uc_fw.c +++ b/drivers/gpu/drm/xe/xe_uc_fw.c @@ -104,8 +104,10 @@ struct fw_blobs_by_type { }; #define XE_GUC_FIRMWARE_DEFS(fw_def, mmp_ver, major_ver) \ - fw_def(LUNARLAKE, major_ver(xe, guc, lnl, 70, 19, 2)) \ + fw_def(BATTLEMAGE, major_ver(intel-ci/xe, guc, bmg, 70, 24, 0)) \ + fw_def(LUNARLAKE, major_ver(intel-ci/xe, guc, lnl, 70, 24, 0)) \ fw_def(METEORLAKE, major_ver(i915, guc, mtl, 70, 19, 2)) \ + fw_def(PVC, mmp_ver(intel-ci/xe, guc, pvc, 70, 24, 0)) \ fw_def(DG2, major_ver(i915, guc, dg2, 70, 19, 2)) \ fw_def(DG1, major_ver(i915, guc, dg1, 70, 19, 2)) \ fw_def(ALDERLAKE_N, major_ver(i915, guc, tgl, 70, 19, 2)) \ @@ -115,6 +117,7 @@ struct fw_blobs_by_type { fw_def(TIGERLAKE, major_ver(i915, guc, tgl, 70, 19, 2)) #define XE_HUC_FIRMWARE_DEFS(fw_def, mmp_ver, no_ver) \ + fw_def(LUNARLAKE, mmp_ver(intel-ci/xe, huc_gsc, lnl, 9, 4, 6)) \ fw_def(METEORLAKE, no_ver(i915, huc_gsc, mtl)) \ fw_def(DG1, no_ver(i915, huc, dg1)) \ fw_def(ALDERLAKE_P, no_ver(i915, huc, tgl)) \ diff --git a/include/drm/xe_pciids.h b/include/drm/xe_pciids.h index adb37bc541e4..c7fc288dacee 100644 --- a/include/drm/xe_pciids.h +++ b/include/drm/xe_pciids.h @@ -187,6 +187,22 @@ MACRO__(0x7DD1, ## __VA_ARGS__), \ MACRO__(0x7DD5, ## __VA_ARGS__) +/* PVC */ +#define XE_PVC_IDS(MACRO__, ...) \ + MACRO__(0x0B69, ## __VA_ARGS__), \ + MACRO__(0x0B6E, ## __VA_ARGS__), \ + MACRO__(0x0BD4, ## __VA_ARGS__), \ + MACRO__(0x0BD5, ## __VA_ARGS__), \ + MACRO__(0x0BD6, ## __VA_ARGS__), \ + MACRO__(0x0BD7, ## __VA_ARGS__), \ + MACRO__(0x0BD8, ## __VA_ARGS__), \ + MACRO__(0x0BD9, ## __VA_ARGS__), \ + MACRO__(0x0BDA, ## __VA_ARGS__), \ + MACRO__(0x0BDB, ## __VA_ARGS__), \ + MACRO__(0x0BE0, ## __VA_ARGS__), \ + MACRO__(0x0BE1, ## __VA_ARGS__), \ + MACRO__(0x0BE5, ## __VA_ARGS__) + #define XE_LNL_IDS(MACRO__, ...) \ MACRO__(0x6420, ## __VA_ARGS__), \ MACRO__(0x64A0, ## __VA_ARGS__), \ |