Commit 7e28d0b2 authored by Tejas Upadhyay's avatar Tejas Upadhyay Committed by Jani Nikula
Browse files

drm/i915/adl-n: Enable ADL-N platform 



Adding PCI device ids and enabling ADL-N platform.
ADL-N from i915 point of view is subplatform of ADL-P.

BSpec: 68397

Changes since V2:
	- Added version log history
Changes since V1:
	- replace IS_ALDERLAKE_N with IS_ADLP_N - Jani Nikula

Signed-off-by: default avatarTejas Upadhyay <tejaskumarx.surendrakumar.upadhyay@intel.com>
Reviewed-by: default avatarAnusha Srivatsa <anusha.srivatsa@intel.com>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211210051802.4063958-1-tejaskumarx.surendrakumar.upadhyay@intel.com
parent a36e7dc0

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_ADLN_IDS(&gen11_early_ops),

	INTEL_RPLS_IDS(&gen11_early_ops),

};

drivers/gpu/drm/i915/i915_drv.h

+2 −0
Original line number Diff line number Diff line
@@ -1267,6 +1267,8 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, 
	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_ADLP_N(dev_priv) \

	IS_SUBPLATFORM(dev_priv, INTEL_ALDERLAKE_P, INTEL_SUBPLATFORM_N)

#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
@@ -1129,6 +1129,7 @@ static const struct pci_device_id pciidlist[] = { 
	INTEL_RKL_IDS(&rkl_info),

	INTEL_ADLS_IDS(&adl_s_info),

	INTEL_ADLP_IDS(&adl_p_info),

	INTEL_ADLN_IDS(&adl_p_info),

	INTEL_DG1_IDS(&dg1_info),

	INTEL_RPLS_IDS(&adl_s_info),

	{0, 0, 0}

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_n_ids[] = {

	INTEL_ADLN_IDS(0),

};



static const u16 subplatform_rpls_ids[] = {

	INTEL_RPLS_IDS(0),

};
@@ -217,6 +221,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_n_ids,

				ARRAY_SIZE(subplatform_n_ids))) {

		mask = BIT(INTEL_SUBPLATFORM_N);

	} else if (find_devid(devid, subplatform_rpls_ids,

			      ARRAY_SIZE(subplatform_rpls_ids))) {

		mask = BIT(INTEL_SUBPLATFORM_RPL_S);

drivers/gpu/drm/i915/intel_device_info.h

+3 −0
Original line number Diff line number Diff line
@@ -113,6 +113,9 @@ enum intel_platform { 
/* ADL-S */

#define INTEL_SUBPLATFORM_RPL_S	0



/* ADL-P */

#define INTEL_SUBPLATFORM_N    0



enum intel_ppgtt_type {

	INTEL_PPGTT_NONE = I915_GEM_PPGTT_NONE,

	INTEL_PPGTT_ALIASING = I915_GEM_PPGTT_ALIASING,