diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2024-10-15 17:58:58 +0300 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2024-10-15 17:58:58 +0300 |
| commit | 85d9d773f7968fa6865ad2250baef44f03883dfa (patch) | |
| tree | 26e32000b6a10172c52913a8d227bc2fd3faf11a | |
| parent | 6e20c253608b0ba2876c1aabe95f885d7000e9b4 (diff) | |
| parent | ec78e665e25834158bb45dd6c62452677cd5ceaf (diff) | |
Merge remote-tracking branch 'drm_xe_push/topic/xe-for-CI' into drm-tip
| -rw-r--r-- | drivers/gpu/drm/xe/xe_module.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/xe/xe_pci.c | 7 | ||||
| -rw-r--r-- | drivers/gpu/drm/xe/xe_uc_fw.c | 1 |
3 files changed, 10 insertions, 1 deletions
diff --git a/drivers/gpu/drm/xe/xe_module.c b/drivers/gpu/drm/xe/xe_module.c index bfc3deebdaa2..77ce9f9ca7a5 100644 --- a/drivers/gpu/drm/xe/xe_module.c +++ b/drivers/gpu/drm/xe/xe_module.c @@ -21,6 +21,9 @@ struct xe_modparam xe_modparam = { .probe_display = true, .guc_log_level = 5, .force_probe = CONFIG_DRM_XE_FORCE_PROBE, +#ifdef CONFIG_PCI_IOV + .max_vfs = IS_ENABLED(CONFIG_DRM_XE_DEBUG) ? ~0 : 0, +#endif .wedged_mode = 1, /* the rest are 0 by default */ }; diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c index 64a8336ca437..4085bb3b6550 100644 --- a/drivers/gpu/drm/xe/xe_pci.c +++ b/drivers/gpu/drm/xe/xe_pci.c @@ -241,6 +241,7 @@ static const struct xe_device_desc adl_s_desc = { PLATFORM(ALDERLAKE_S), .has_display = true, .has_llc = true, + .has_sriov = IS_ENABLED(CONFIG_DRM_XE_DEBUG), .require_force_probe = true, .subplatforms = (const struct xe_subplatform_desc[]) { { XE_SUBPLATFORM_ALDERLAKE_S_RPLS, "RPLS", adls_rpls_ids }, @@ -256,6 +257,7 @@ static const struct xe_device_desc adl_p_desc = { PLATFORM(ALDERLAKE_P), .has_display = true, .has_llc = true, + .has_sriov = IS_ENABLED(CONFIG_DRM_XE_DEBUG), .require_force_probe = true, .subplatforms = (const struct xe_subplatform_desc[]) { { XE_SUBPLATFORM_ALDERLAKE_P_RPLU, "RPLU", adlp_rplu_ids }, @@ -269,6 +271,7 @@ static const struct xe_device_desc adl_n_desc = { PLATFORM(ALDERLAKE_N), .has_display = true, .has_llc = true, + .has_sriov = IS_ENABLED(CONFIG_DRM_XE_DEBUG), .require_force_probe = true, }; @@ -307,6 +310,7 @@ static const struct xe_device_desc ats_m_desc = { DG2_FEATURES, .has_display = false, + .has_sriov = IS_ENABLED(CONFIG_DRM_XE_DEBUG), }; static const struct xe_device_desc dg2_desc = { @@ -318,7 +322,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(PVC), @@ -398,6 +402,7 @@ static const struct pci_device_id pciidlist[] = { XE_ATS_M_IDS(INTEL_VGA_DEVICE, &ats_m_desc), XE_ARL_IDS(INTEL_VGA_DEVICE, &mtl_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), XE_BMG_IDS(INTEL_VGA_DEVICE, &bmg_desc), diff --git a/drivers/gpu/drm/xe/xe_uc_fw.c b/drivers/gpu/drm/xe/xe_uc_fw.c index fb0eda3d5682..087fb96f707e 100644 --- a/drivers/gpu/drm/xe/xe_uc_fw.c +++ b/drivers/gpu/drm/xe/xe_uc_fw.c @@ -110,6 +110,7 @@ struct fw_blobs_by_type { fw_def(BATTLEMAGE, major_ver(xe, guc, bmg, 70, 29, 2)) \ fw_def(LUNARLAKE, major_ver(xe, guc, lnl, 70, 29, 2)) \ fw_def(METEORLAKE, major_ver(i915, guc, mtl, 70, 29, 2)) \ + fw_def(PVC, mmp_ver(xe, guc, pvc, 70, 29, 2)) \ fw_def(DG2, major_ver(i915, guc, dg2, 70, 29, 2)) \ fw_def(DG1, major_ver(i915, guc, dg1, 70, 29, 2)) \ fw_def(ALDERLAKE_N, major_ver(i915, guc, tgl, 70, 29, 2)) \ |