Commit 52407c22 authored by Anusha Srivatsa's avatar Anusha Srivatsa Committed by José Roberto de Souza
Browse files

drm/i915/rpl-s: Add PCI IDS for Raptor Lake S 



Raptor Lake S(RPL-S) is a version 12
Display, Media and Render. For all i915
purposes it is the same as Alder Lake S (ADL-S).

Introduce RPL-S as a subplatform
of ADL-S. This patch adds PCI ids for RPL-S.

BSpec: 53655
Cc: x86@kernel.org
Cc: dri-devel@lists.freedesktop.org
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: Matt Roper <matthew.d.roper@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Signed-off-by: default avatarAnusha Srivatsa <anusha.srivatsa@intel.com>
Reviewed-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
Acked-by: Dave Hansen <dave.hansen@linux.intel.com> # arch/x86
Acked-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211203063545.2254380-2-anusha.srivatsa@intel.com
parent d4a23930

arch/x86/kernel/early-quirks.c

+1 −0
Original line number Diff line number Diff line
@@ -554,6 +554,7 @@ static const struct pci_device_id intel_early_ids[] __initconst = { 
	INTEL_RKL_IDS(&gen11_early_ops),

	INTEL_ADLS_IDS(&gen11_early_ops),

	INTEL_ADLP_IDS(&gen11_early_ops),

	INTEL_RPLS_IDS(&gen11_early_ops),

};



struct resource intel_graphics_stolen_res __ro_after_init = DEFINE_RES_MEM(0, 0);

drivers/gpu/drm/i915/i915_drv.h

+2 −0
Original line number Diff line number Diff line
@@ -1281,6 +1281,8 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, 
	IS_SUBPLATFORM(dev_priv, INTEL_DG2, INTEL_SUBPLATFORM_G10)

#define IS_DG2_G11(dev_priv) \

	IS_SUBPLATFORM(dev_priv, INTEL_DG2, INTEL_SUBPLATFORM_G11)

#define IS_ADLS_RPLS(dev_priv) \

	IS_SUBPLATFORM(dev_priv, INTEL_ALDERLAKE_S, INTEL_SUBPLATFORM_RPL_S)

#define IS_HSW_EARLY_SDV(dev_priv) (IS_HASWELL(dev_priv) && \

				    (INTEL_DEVID(dev_priv) & 0xFF00) == 0x0C00)

#define IS_BDW_ULT(dev_priv) \

drivers/gpu/drm/i915/i915_pci.c

+1 −0
Original line number Diff line number Diff line
@@ -1133,6 +1133,7 @@ static const struct pci_device_id pciidlist[] = { 
	INTEL_ADLS_IDS(&adl_s_info),

	INTEL_ADLP_IDS(&adl_p_info),

	INTEL_DG1_IDS(&dg1_info),

	INTEL_RPLS_IDS(&adl_s_info),

	{0, 0, 0}

};

MODULE_DEVICE_TABLE(pci, pciidlist);

drivers/gpu/drm/i915/intel_device_info.c

+7 −0
Original line number Diff line number Diff line
@@ -177,6 +177,10 @@ static const u16 subplatform_portf_ids[] = { 
	INTEL_ICL_PORT_F_IDS(0),

};



static const u16 subplatform_rpls_ids[] = {

	INTEL_RPLS_IDS(0),

};



static bool find_devid(u16 id, const u16 *p, unsigned int num)

{

	for (; num; num--, p++) {
@@ -213,6 +217,9 @@ void intel_device_info_subplatform_init(struct drm_i915_private *i915) 
	} else if (find_devid(devid, subplatform_portf_ids,

			      ARRAY_SIZE(subplatform_portf_ids))) {

		mask = BIT(INTEL_SUBPLATFORM_PORTF);

	} else if (find_devid(devid, subplatform_rpls_ids,

			      ARRAY_SIZE(subplatform_rpls_ids))) {

		mask = BIT(INTEL_SUBPLATFORM_RPL_S);

	}



	if (IS_TIGERLAKE(i915)) {

drivers/gpu/drm/i915/intel_device_info.h

+3 −0
Original line number Diff line number Diff line
@@ -110,6 +110,9 @@ enum intel_platform { 
#define INTEL_SUBPLATFORM_G10	0

#define INTEL_SUBPLATFORM_G11	1



/* ADL-S */

#define INTEL_SUBPLATFORM_RPL_S	0



enum intel_ppgtt_type {

	INTEL_PPGTT_NONE = I915_GEM_PPGTT_NONE,

	INTEL_PPGTT_ALIASING = I915_GEM_PPGTT_ALIASING,