History

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.

Anusha Srivatsa committed 4 years ago

Commit 52407c21 parent d4a23936 files · +23 −0Browse files

Unified · Split

6 files
  1. arch/x86/kernel/early-quirks.c +1 −0
  2. drivers/gpu/drm/i915/i915_drv.h +2 −0
  3. drivers/gpu/drm/i915/i915_pci.c +1 −0
  4. drivers/gpu/drm/i915/intel_device_info.c +7 −0
  5. drivers/gpu/drm/i915/intel_device_info.h +3 −0
  6. include/drm/i915_pciids.h +9 −0
arch/x86/kernel/early-quirks.c+1−0
@@ -554,6 +554,7 @@ static const struct pci_device_id intel_early_ids[] __initconst = { · 553 unmodified lines
554 INTEL_RKL_IDS(&gen11_early_ops),554 INTEL_RKL_IDS(&gen11_early_ops),
555 INTEL_ADLS_IDS(&gen11_early_ops),555 INTEL_ADLS_IDS(&gen11_early_ops),
556 INTEL_ADLP_IDS(&gen11_early_ops),556 INTEL_ADLP_IDS(&gen11_early_ops),
557 INTEL_RPLS_IDS(&gen11_early_ops),
557};558};
558 559
559struct resource intel_graphics_stolen_res __ro_after_init = DEFINE_RES_MEM(0, 0);560struct resource intel_graphics_stolen_res __ro_after_init = DEFINE_RES_MEM(0, 0);
drivers/gpu/drm/i915/i915_drv.h+2−0
@@ -1281,6 +1281,8 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, · 1280 unmodified lines
1281 IS_SUBPLATFORM(dev_priv, INTEL_DG2, INTEL_SUBPLATFORM_G10)1281 IS_SUBPLATFORM(dev_priv, INTEL_DG2, INTEL_SUBPLATFORM_G10)
1282#define IS_DG2_G11(dev_priv) \1282#define IS_DG2_G11(dev_priv) \
1283 IS_SUBPLATFORM(dev_priv, INTEL_DG2, INTEL_SUBPLATFORM_G11)1283 IS_SUBPLATFORM(dev_priv, INTEL_DG2, INTEL_SUBPLATFORM_G11)
1284#define IS_ADLS_RPLS(dev_priv) \
1285 IS_SUBPLATFORM(dev_priv, INTEL_ALDERLAKE_S, INTEL_SUBPLATFORM_RPL_S)
1284#define IS_HSW_EARLY_SDV(dev_priv) (IS_HASWELL(dev_priv) && \1286#define IS_HSW_EARLY_SDV(dev_priv) (IS_HASWELL(dev_priv) && \
1285 (INTEL_DEVID(dev_priv) & 0xFF00) == 0x0C00)1287 (INTEL_DEVID(dev_priv) & 0xFF00) == 0x0C00)
1286#define IS_BDW_ULT(dev_priv) \1288#define IS_BDW_ULT(dev_priv) \
drivers/gpu/drm/i915/i915_pci.c+1−0
@@ -1133,6 +1133,7 @@ static const struct pci_device_id pciidlist[] = { · 1132 unmodified lines
1133 INTEL_ADLS_IDS(&adl_s_info),1133 INTEL_ADLS_IDS(&adl_s_info),
1134 INTEL_ADLP_IDS(&adl_p_info),1134 INTEL_ADLP_IDS(&adl_p_info),
1135 INTEL_DG1_IDS(&dg1_info),1135 INTEL_DG1_IDS(&dg1_info),
1136 INTEL_RPLS_IDS(&adl_s_info),
1136 {0, 0, 0}1137 {0, 0, 0}
1137};1138};
1138MODULE_DEVICE_TABLE(pci, pciidlist);1139MODULE_DEVICE_TABLE(pci, pciidlist);
drivers/gpu/drm/i915/intel_device_info.c+7−0
@@ -177,6 +177,10 @@ static const u16 subplatform_portf_ids[] = { · 176 unmodified lines
177 INTEL_ICL_PORT_F_IDS(0),177 INTEL_ICL_PORT_F_IDS(0),
178};178};
179 179
180static const u16 subplatform_rpls_ids[] = {
181 INTEL_RPLS_IDS(0),
182};
183
180static bool find_devid(u16 id, const u16 *p, unsigned int num)184static bool find_devid(u16 id, const u16 *p, unsigned int num)
181{185{
182 for (; num; num--, p++) {186 for (; num; num--, p++) {
@@ -213,6 +217,9 @@ void intel_device_info_subplatform_init(struct drm_i915_private *i915) · 30 unmodified lines
213 } else if (find_devid(devid, subplatform_portf_ids,217 } else if (find_devid(devid, subplatform_portf_ids,
214 ARRAY_SIZE(subplatform_portf_ids))) {218 ARRAY_SIZE(subplatform_portf_ids))) {
215 mask = BIT(INTEL_SUBPLATFORM_PORTF);219 mask = BIT(INTEL_SUBPLATFORM_PORTF);
220 } else if (find_devid(devid, subplatform_rpls_ids,
221 ARRAY_SIZE(subplatform_rpls_ids))) {
222 mask = BIT(INTEL_SUBPLATFORM_RPL_S);
216 }223 }
217 224
218 if (IS_TIGERLAKE(i915)) {225 if (IS_TIGERLAKE(i915)) {
drivers/gpu/drm/i915/intel_device_info.h+3−0
@@ -110,6 +110,9 @@ enum intel_platform { · 109 unmodified lines
110#define INTEL_SUBPLATFORM_G10 0110#define INTEL_SUBPLATFORM_G10 0
111#define INTEL_SUBPLATFORM_G11 1111#define INTEL_SUBPLATFORM_G11 1
112 112
113/* ADL-S */
114#define INTEL_SUBPLATFORM_RPL_S 0
115
113enum intel_ppgtt_type {116enum intel_ppgtt_type {
114 INTEL_PPGTT_NONE = I915_GEM_PPGTT_NONE,117 INTEL_PPGTT_NONE = I915_GEM_PPGTT_NONE,
115 INTEL_PPGTT_ALIASING = I915_GEM_PPGTT_ALIASING,118 INTEL_PPGTT_ALIASING = I915_GEM_PPGTT_ALIASING,
include/drm/i915_pciids.h+9−0
@@ -666,4 +666,13 @@ · 665 unmodified lines
666 INTEL_VGA_DEVICE(0x46C2, info), \666 INTEL_VGA_DEVICE(0x46C2, info), \
667 INTEL_VGA_DEVICE(0x46C3, info)667 INTEL_VGA_DEVICE(0x46C3, info)
668 668
669/* RPL-S */
670#define INTEL_RPLS_IDS(info) \
671 INTEL_VGA_DEVICE(0xA780, info), \
672 INTEL_VGA_DEVICE(0xA781, info), \
673 INTEL_VGA_DEVICE(0xA782, info), \
674 INTEL_VGA_DEVICE(0xA783, info), \
675 INTEL_VGA_DEVICE(0xA788, info), \
676 INTEL_VGA_DEVICE(0xA789, info)
677
669#endif /* _I915_PCIIDS_H */678#endif /* _I915_PCIIDS_H */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t