Skip to content

Commit 7e28d0b

Browse files
tejaskuxjnikula
authored andcommitted
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: Tejas Upadhyay <[email protected]> Reviewed-by: Anusha Srivatsa <[email protected]> Acked-by: Thomas Gleixner <[email protected]> Signed-off-by: Jani Nikula <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/20211210051802.4063958-1-tejaskumarx.surendrakumar.upadhyay@intel.com
1 parent a36e7dc commit 7e28d0b

File tree

6 files changed

+20
-0
lines changed

6 files changed

+20
-0
lines changed

arch/x86/kernel/early-quirks.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -554,6 +554,7 @@ static const struct pci_device_id intel_early_ids[] __initconst = {
554554
INTEL_RKL_IDS(&gen11_early_ops),
555555
INTEL_ADLS_IDS(&gen11_early_ops),
556556
INTEL_ADLP_IDS(&gen11_early_ops),
557+
INTEL_ADLN_IDS(&gen11_early_ops),
557558
INTEL_RPLS_IDS(&gen11_early_ops),
558559
};
559560

drivers/gpu/drm/i915/i915_drv.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1267,6 +1267,8 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
12671267
IS_SUBPLATFORM(dev_priv, INTEL_DG2, INTEL_SUBPLATFORM_G11)
12681268
#define IS_ADLS_RPLS(dev_priv) \
12691269
IS_SUBPLATFORM(dev_priv, INTEL_ALDERLAKE_S, INTEL_SUBPLATFORM_RPL_S)
1270+
#define IS_ADLP_N(dev_priv) \
1271+
IS_SUBPLATFORM(dev_priv, INTEL_ALDERLAKE_P, INTEL_SUBPLATFORM_N)
12701272
#define IS_HSW_EARLY_SDV(dev_priv) (IS_HASWELL(dev_priv) && \
12711273
(INTEL_DEVID(dev_priv) & 0xFF00) == 0x0C00)
12721274
#define IS_BDW_ULT(dev_priv) \

drivers/gpu/drm/i915/i915_pci.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1129,6 +1129,7 @@ static const struct pci_device_id pciidlist[] = {
11291129
INTEL_RKL_IDS(&rkl_info),
11301130
INTEL_ADLS_IDS(&adl_s_info),
11311131
INTEL_ADLP_IDS(&adl_p_info),
1132+
INTEL_ADLN_IDS(&adl_p_info),
11321133
INTEL_DG1_IDS(&dg1_info),
11331134
INTEL_RPLS_IDS(&adl_s_info),
11341135
{0, 0, 0}

drivers/gpu/drm/i915/intel_device_info.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,10 @@ static const u16 subplatform_portf_ids[] = {
177177
INTEL_ICL_PORT_F_IDS(0),
178178
};
179179

180+
static const u16 subplatform_n_ids[] = {
181+
INTEL_ADLN_IDS(0),
182+
};
183+
180184
static const u16 subplatform_rpls_ids[] = {
181185
INTEL_RPLS_IDS(0),
182186
};
@@ -217,6 +221,9 @@ void intel_device_info_subplatform_init(struct drm_i915_private *i915)
217221
} else if (find_devid(devid, subplatform_portf_ids,
218222
ARRAY_SIZE(subplatform_portf_ids))) {
219223
mask = BIT(INTEL_SUBPLATFORM_PORTF);
224+
} else if (find_devid(devid, subplatform_n_ids,
225+
ARRAY_SIZE(subplatform_n_ids))) {
226+
mask = BIT(INTEL_SUBPLATFORM_N);
220227
} else if (find_devid(devid, subplatform_rpls_ids,
221228
ARRAY_SIZE(subplatform_rpls_ids))) {
222229
mask = BIT(INTEL_SUBPLATFORM_RPL_S);

drivers/gpu/drm/i915/intel_device_info.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,9 @@ enum intel_platform {
113113
/* ADL-S */
114114
#define INTEL_SUBPLATFORM_RPL_S 0
115115

116+
/* ADL-P */
117+
#define INTEL_SUBPLATFORM_N 0
118+
116119
enum intel_ppgtt_type {
117120
INTEL_PPGTT_NONE = I915_GEM_PPGTT_NONE,
118121
INTEL_PPGTT_ALIASING = I915_GEM_PPGTT_ALIASING,

include/drm/i915_pciids.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -666,6 +666,12 @@
666666
INTEL_VGA_DEVICE(0x46C2, info), \
667667
INTEL_VGA_DEVICE(0x46C3, info)
668668

669+
/* ADL-N */
670+
#define INTEL_ADLN_IDS(info) \
671+
INTEL_VGA_DEVICE(0x46D0, info), \
672+
INTEL_VGA_DEVICE(0x46D1, info), \
673+
INTEL_VGA_DEVICE(0x46D2, info)
674+
669675
/* RPL-S */
670676
#define INTEL_RPLS_IDS(info) \
671677
INTEL_VGA_DEVICE(0xA780, info), \

0 commit comments

Comments
 (0)