From fcb33ca6d6296d2bd45550e26271797801aeb640 Mon Sep 17 00:00:00 2001 From: Anusha Srivatsa Date: Thu, 5 Oct 2023 13:54:48 -0700 Subject: [PATCH] drm/xe/rpls: Add RPLS Support Add RPLS support that was missing apart from the PCI IDs. v2: Also add the support in xe_wa_test kunit v3: rebased. Cc: Dnyaneshwar Bhadane Signed-off-by: Anusha Srivatsa Reviewed-by: Matt Roper (v1) Reviewed-by: Lucas De Marchi Link: https://lore.kernel.org/r/20231005205450.3177354-4-anusha.srivatsa@intel.com Signed-off-by: Rodrigo Vivi --- drivers/gpu/drm/xe/tests/xe_wa_test.c | 1 + drivers/gpu/drm/xe/xe_pci.c | 7 +++++++ drivers/gpu/drm/xe/xe_platform_types.h | 1 + 3 files changed, 9 insertions(+) diff --git a/drivers/gpu/drm/xe/tests/xe_wa_test.c b/drivers/gpu/drm/xe/tests/xe_wa_test.c index 16f7f157c8753..69c9ea1fa82bc 100644 --- a/drivers/gpu/drm/xe/tests/xe_wa_test.c +++ b/drivers/gpu/drm/xe/tests/xe_wa_test.c @@ -49,6 +49,7 @@ static const struct platform_test_case cases[] = { PLATFORM_CASE(ALDERLAKE_P, A0), PLATFORM_CASE(ALDERLAKE_P, B0), PLATFORM_CASE(ALDERLAKE_P, C0), + SUBPLATFORM_CASE(ALDERLAKE_S, RPLS, D0), SUBPLATFORM_CASE(DG2, G10, A0), SUBPLATFORM_CASE(DG2, G10, A1), SUBPLATFORM_CASE(DG2, G10, B0), diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c index 2652e7426258a..0efe01885cf8b 100644 --- a/drivers/gpu/drm/xe/xe_pci.c +++ b/drivers/gpu/drm/xe/xe_pci.c @@ -213,12 +213,18 @@ static const struct xe_device_desc rkl_desc = { .require_force_probe = true, }; +static const u16 adls_rpls_ids[] = { XE_RPLS_IDS(NOP), 0 }; + static const struct xe_device_desc adl_s_desc = { .graphics = &graphics_xelp, .media = &media_xem, PLATFORM(XE_ALDERLAKE_S), .has_llc = 1, .require_force_probe = true, + .subplatforms = (const struct xe_subplatform_desc[]) { + { XE_SUBPLATFORM_ALDERLAKE_S_RPLS, "RPLS", adls_rpls_ids }, + {}, + }, }; static const u16 adlp_rplu_ids[] = { XE_RPLU_IDS(NOP), 0 }; @@ -335,6 +341,7 @@ static const struct pci_device_id pciidlist[] = { XE_ADLP_IDS(INTEL_VGA_DEVICE, &adl_p_desc), XE_ADLN_IDS(INTEL_VGA_DEVICE, &adl_n_desc), XE_RPLP_IDS(INTEL_VGA_DEVICE, &adl_p_desc), + XE_RPLS_IDS(INTEL_VGA_DEVICE, &adl_s_desc), 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), diff --git a/drivers/gpu/drm/xe/xe_platform_types.h b/drivers/gpu/drm/xe/xe_platform_types.h index b6fe4342f9f6a..553f53dbd093e 100644 --- a/drivers/gpu/drm/xe/xe_platform_types.h +++ b/drivers/gpu/drm/xe/xe_platform_types.h @@ -28,6 +28,7 @@ enum xe_subplatform { XE_SUBPLATFORM_UNINITIALIZED = 0, XE_SUBPLATFORM_NONE, XE_SUBPLATFORM_ALDERLAKE_P_RPLU, + XE_SUBPLATFORM_ALDERLAKE_S_RPLS, XE_SUBPLATFORM_DG2_G10, XE_SUBPLATFORM_DG2_G11, XE_SUBPLATFORM_DG2_G12, -- 2.30.2