* [Intel-gfx] [v3 0/3] Introduce Raptor Lake S
@ 2021-12-01 7:00 Anusha Srivatsa
2021-12-01 7:00 ` [Intel-gfx] [v3 1/3] drm/i915/rpl-s: Add PCI IDS for " Anusha Srivatsa
` (3 more replies)
0 siblings, 4 replies; 10+ messages in thread
From: Anusha Srivatsa @ 2021-12-01 7:00 UTC (permalink / raw)
To: intel-gfx
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).
The series introduces it as a subplatform
of ADL-S. The one difference is the GuC
submission which is default on RPL-S but
was not the case with ADL-S.
Anusha Srivatsa (3):
drm/i915/rpl-s: Add PCI IDS for Raptor Lake S
drm/i915/rpl-s: Add PCH Support for Raptor Lake S
drm/i915/rpl-s: Enable guc submission by default
arch/x86/kernel/early-quirks.c | 1 +
drivers/gpu/drm/i915/gt/uc/intel_uc.c | 2 +-
drivers/gpu/drm/i915/i915_drv.h | 2 ++
drivers/gpu/drm/i915/i915_pci.c | 1 +
drivers/gpu/drm/i915/intel_device_info.c | 7 +++++++
drivers/gpu/drm/i915/intel_device_info.h | 3 +++
drivers/gpu/drm/i915/intel_pch.c | 1 +
drivers/gpu/drm/i915/intel_pch.h | 1 +
include/drm/i915_pciids.h | 9 +++++++++
9 files changed, 26 insertions(+), 1 deletion(-)
--
2.25.1
^ permalink raw reply [flat|nested] 10+ messages in thread* [Intel-gfx] [v3 1/3] drm/i915/rpl-s: Add PCI IDS for Raptor Lake S 2021-12-01 7:00 [Intel-gfx] [v3 0/3] Introduce Raptor Lake S Anusha Srivatsa @ 2021-12-01 7:00 ` Anusha Srivatsa 2021-12-01 7:00 ` [Intel-gfx] [v3 2/3] drm/i915/rpl-s: Add PCH Support " Anusha Srivatsa ` (2 subsequent siblings) 3 siblings, 0 replies; 10+ messages in thread From: Anusha Srivatsa @ 2021-12-01 7:00 UTC (permalink / raw) To: intel-gfx 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. v2: Update PCI IDs. - Add more description to commit message (Jani) v3: s/IS_RAPTORLAKE/IS_ADLS_RPLS (Jani) - Fix comment (Tvrtko) BSpec: 53655 Cc: Matt Roper <matthew.d.roper@intel.com> Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> Cc: Swathi Dhanavanthri <swathi.dhanavanthri@intel.com> Cc: Jani Nikula <jani.nikula@linux.intel.com> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com> --- arch/x86/kernel/early-quirks.c | 1 + drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/i915_pci.c | 1 + drivers/gpu/drm/i915/intel_device_info.c | 7 +++++++ drivers/gpu/drm/i915/intel_device_info.h | 3 +++ include/drm/i915_pciids.h | 9 +++++++++ 6 files changed, 23 insertions(+) diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c index 391a4e2b8604..fd2d3ab38ebb 100644 --- a/arch/x86/kernel/early-quirks.c +++ b/arch/x86/kernel/early-quirks.c @@ -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); diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 1bfadd9127fc..88c4fd80dcbe 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -1469,6 +1469,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) \ diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c index f01cba4ec283..061b2e076373 100644 --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c @@ -1131,6 +1131,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); diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c index 6e6b317bc33c..cae51d9dd7ea 100644 --- a/drivers/gpu/drm/i915/intel_device_info.c +++ b/drivers/gpu/drm/i915/intel_device_info.c @@ -182,6 +182,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++) { @@ -218,6 +222,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)) { diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h index 669f0d26c3c3..2bedf73e0a7d 100644 --- a/drivers/gpu/drm/i915/intel_device_info.h +++ b/drivers/gpu/drm/i915/intel_device_info.h @@ -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, diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h index c00ac54692d7..baf3d1d3d566 100644 --- a/include/drm/i915_pciids.h +++ b/include/drm/i915_pciids.h @@ -666,4 +666,13 @@ INTEL_VGA_DEVICE(0x46C2, info), \ INTEL_VGA_DEVICE(0x46C3, info) +/* RPL-S */ +#define INTEL_RPLS_IDS(info) \ + INTEL_VGA_DEVICE(0xA780, info), \ + INTEL_VGA_DEVICE(0xA781, info), \ + INTEL_VGA_DEVICE(0xA782, info), \ + INTEL_VGA_DEVICE(0xA783, info), \ + INTEL_VGA_DEVICE(0xA788, info), \ + INTEL_VGA_DEVICE(0xA789, info) + #endif /* _I915_PCIIDS_H */ -- 2.25.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Intel-gfx] [v3 2/3] drm/i915/rpl-s: Add PCH Support for Raptor Lake S 2021-12-01 7:00 [Intel-gfx] [v3 0/3] Introduce Raptor Lake S Anusha Srivatsa 2021-12-01 7:00 ` [Intel-gfx] [v3 1/3] drm/i915/rpl-s: Add PCI IDS for " Anusha Srivatsa @ 2021-12-01 7:00 ` Anusha Srivatsa 2021-12-01 7:00 ` [Intel-gfx] [v3 3/3] drm/i915/rpl-s: Enable guc submission by default Anusha Srivatsa 2021-12-01 7:15 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for Introduce Raptor Lake S (rev3) Patchwork 3 siblings, 0 replies; 10+ messages in thread From: Anusha Srivatsa @ 2021-12-01 7:00 UTC (permalink / raw) To: intel-gfx Add the PCH ID for RPL-S. v2: Self contained commit message (Jani) Cc: Jani Nikula <jani.nikula@linux.intel.com> Cc: Swathi Dhanavanthri <swathi.dhanavanthri@intel.com> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com> --- drivers/gpu/drm/i915/intel_pch.c | 1 + drivers/gpu/drm/i915/intel_pch.h | 1 + 2 files changed, 2 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_pch.c b/drivers/gpu/drm/i915/intel_pch.c index d1d4b97b86f5..da8f82c2342f 100644 --- a/drivers/gpu/drm/i915/intel_pch.c +++ b/drivers/gpu/drm/i915/intel_pch.c @@ -129,6 +129,7 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id) return PCH_JSP; case INTEL_PCH_ADP_DEVICE_ID_TYPE: case INTEL_PCH_ADP2_DEVICE_ID_TYPE: + case INTEL_PCH_ADP3_DEVICE_ID_TYPE: drm_dbg_kms(&dev_priv->drm, "Found Alder Lake PCH\n"); drm_WARN_ON(&dev_priv->drm, !IS_ALDERLAKE_S(dev_priv) && !IS_ALDERLAKE_P(dev_priv)); diff --git a/drivers/gpu/drm/i915/intel_pch.h b/drivers/gpu/drm/i915/intel_pch.h index 7c0d83d292dc..6bff77521094 100644 --- a/drivers/gpu/drm/i915/intel_pch.h +++ b/drivers/gpu/drm/i915/intel_pch.h @@ -57,6 +57,7 @@ enum intel_pch { #define INTEL_PCH_JSP2_DEVICE_ID_TYPE 0x3880 #define INTEL_PCH_ADP_DEVICE_ID_TYPE 0x7A80 #define INTEL_PCH_ADP2_DEVICE_ID_TYPE 0x5180 +#define INTEL_PCH_ADP3_DEVICE_ID_TYPE 0x7A00 #define INTEL_PCH_P2X_DEVICE_ID_TYPE 0x7100 #define INTEL_PCH_P3X_DEVICE_ID_TYPE 0x7000 #define INTEL_PCH_QEMU_DEVICE_ID_TYPE 0x2900 /* qemu q35 has 2918 */ -- 2.25.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Intel-gfx] [v3 3/3] drm/i915/rpl-s: Enable guc submission by default 2021-12-01 7:00 [Intel-gfx] [v3 0/3] Introduce Raptor Lake S Anusha Srivatsa 2021-12-01 7:00 ` [Intel-gfx] [v3 1/3] drm/i915/rpl-s: Add PCI IDS for " Anusha Srivatsa 2021-12-01 7:00 ` [Intel-gfx] [v3 2/3] drm/i915/rpl-s: Add PCH Support " Anusha Srivatsa @ 2021-12-01 7:00 ` Anusha Srivatsa 2021-12-01 9:15 ` Jani Nikula 2021-12-01 7:15 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for Introduce Raptor Lake S (rev3) Patchwork 3 siblings, 1 reply; 10+ messages in thread From: Anusha Srivatsa @ 2021-12-01 7:00 UTC (permalink / raw) To: intel-gfx Though, RPL-S is defined as subplatform of ADL-S, unlike ADL-S, it has GuC submission by default. v2: Remove extra parenthesis (Jani) v3: s/IS_RAPTORLAKE/IS_ADLS_RPLS (Jani) Cc: Jani Nikula <jani.nikula@linux.intel.com> Cc: Swathi Dhanavanthri <swathi.dhanavanthri@intel.com> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com> --- drivers/gpu/drm/i915/gt/uc/intel_uc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c index 2fef3b0bbe95..6aa843a1c25f 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c @@ -35,7 +35,7 @@ static void uc_expand_default_options(struct intel_uc *uc) } /* Intermediate platforms are HuC authentication only */ - if (IS_ALDERLAKE_S(i915)) { + if (IS_ALDERLAKE_S(i915) && !IS_RAPTORLAKE_S(i915)) { i915->params.enable_guc = ENABLE_GUC_LOAD_HUC; return; } -- 2.25.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [Intel-gfx] [v3 3/3] drm/i915/rpl-s: Enable guc submission by default 2021-12-01 7:00 ` [Intel-gfx] [v3 3/3] drm/i915/rpl-s: Enable guc submission by default Anusha Srivatsa @ 2021-12-01 9:15 ` Jani Nikula 2021-12-01 9:45 ` Srivatsa, Anusha 0 siblings, 1 reply; 10+ messages in thread From: Jani Nikula @ 2021-12-01 9:15 UTC (permalink / raw) To: Anusha Srivatsa, intel-gfx On Tue, 30 Nov 2021, Anusha Srivatsa <anusha.srivatsa@intel.com> wrote: > Though, RPL-S is defined as subplatform of ADL-S, unlike > ADL-S, it has GuC submission by default. > > v2: Remove extra parenthesis (Jani) > v3: s/IS_RAPTORLAKE/IS_ADLS_RPLS (Jani) > > Cc: Jani Nikula <jani.nikula@linux.intel.com> > Cc: Swathi Dhanavanthri <swathi.dhanavanthri@intel.com> > Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com> > --- > drivers/gpu/drm/i915/gt/uc/intel_uc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c > index 2fef3b0bbe95..6aa843a1c25f 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c > @@ -35,7 +35,7 @@ static void uc_expand_default_options(struct intel_uc *uc) > } > > /* Intermediate platforms are HuC authentication only */ > - if (IS_ALDERLAKE_S(i915)) { > + if (IS_ALDERLAKE_S(i915) && !IS_RAPTORLAKE_S(i915)) { Forgot to actually git add the change? ;) BR, Jani. > i915->params.enable_guc = ENABLE_GUC_LOAD_HUC; > return; > } -- Jani Nikula, Intel Open Source Graphics Center ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Intel-gfx] [v3 3/3] drm/i915/rpl-s: Enable guc submission by default 2021-12-01 9:15 ` Jani Nikula @ 2021-12-01 9:45 ` Srivatsa, Anusha 0 siblings, 0 replies; 10+ messages in thread From: Srivatsa, Anusha @ 2021-12-01 9:45 UTC (permalink / raw) To: Jani Nikula, intel-gfx@lists.freedesktop.org > -----Original Message----- > From: Jani Nikula <jani.nikula@linux.intel.com> > Sent: Wednesday, December 1, 2021 2:46 PM > To: Srivatsa, Anusha <anusha.srivatsa@intel.com>; intel- > gfx@lists.freedesktop.org > Cc: Srivatsa, Anusha <anusha.srivatsa@intel.com>; Dhanavanthri, Swathi > <swathi.dhanavanthri@intel.com> > Subject: Re: [v3 3/3] drm/i915/rpl-s: Enable guc submission by default > > On Tue, 30 Nov 2021, Anusha Srivatsa <anusha.srivatsa@intel.com> wrote: > > Though, RPL-S is defined as subplatform of ADL-S, unlike ADL-S, it has > > GuC submission by default. > > > > v2: Remove extra parenthesis (Jani) > > v3: s/IS_RAPTORLAKE/IS_ADLS_RPLS (Jani) > > > > Cc: Jani Nikula <jani.nikula@linux.intel.com> > > Cc: Swathi Dhanavanthri <swathi.dhanavanthri@intel.com> > > Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com> > > --- > > drivers/gpu/drm/i915/gt/uc/intel_uc.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c > > b/drivers/gpu/drm/i915/gt/uc/intel_uc.c > > index 2fef3b0bbe95..6aa843a1c25f 100644 > > --- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c > > +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c > > @@ -35,7 +35,7 @@ static void uc_expand_default_options(struct intel_uc > *uc) > > } > > > > /* Intermediate platforms are HuC authentication only */ > > - if (IS_ALDERLAKE_S(i915)) { > > + if (IS_ALDERLAKE_S(i915) && !IS_RAPTORLAKE_S(i915)) { > > Forgot to actually git add the change? ;) Good lord. Look like it. ☹ Anusha > BR, > Jani. > > > i915->params.enable_guc = ENABLE_GUC_LOAD_HUC; > > return; > > } > > -- > Jani Nikula, Intel Open Source Graphics Center ^ permalink raw reply [flat|nested] 10+ messages in thread
* [Intel-gfx] ✗ Fi.CI.BUILD: failure for Introduce Raptor Lake S (rev3) 2021-12-01 7:00 [Intel-gfx] [v3 0/3] Introduce Raptor Lake S Anusha Srivatsa ` (2 preceding siblings ...) 2021-12-01 7:00 ` [Intel-gfx] [v3 3/3] drm/i915/rpl-s: Enable guc submission by default Anusha Srivatsa @ 2021-12-01 7:15 ` Patchwork 3 siblings, 0 replies; 10+ messages in thread From: Patchwork @ 2021-12-01 7:15 UTC (permalink / raw) To: Anusha Srivatsa; +Cc: intel-gfx == Series Details == Series: Introduce Raptor Lake S (rev3) URL : https://patchwork.freedesktop.org/series/96869/ State : failure == Summary == CALL scripts/checksyscalls.sh CALL scripts/atomic/check-atomics.sh DESCEND objtool CHK include/generated/compile.h CC [M] drivers/gpu/drm/i915/gt/uc/intel_uc.o drivers/gpu/drm/i915/gt/uc/intel_uc.c: In function ‘uc_expand_default_options’: drivers/gpu/drm/i915/gt/uc/intel_uc.c:38:31: error: implicit declaration of function ‘IS_RAPTORLAKE_S’; did you mean ‘IS_ALDERLAKE_S’? [-Werror=implicit-function-declaration] if (IS_ALDERLAKE_S(i915) && !IS_RAPTORLAKE_S(i915)) { ^~~~~~~~~~~~~~~ IS_ALDERLAKE_S cc1: all warnings being treated as errors scripts/Makefile.build:287: recipe for target 'drivers/gpu/drm/i915/gt/uc/intel_uc.o' failed make[4]: *** [drivers/gpu/drm/i915/gt/uc/intel_uc.o] Error 1 scripts/Makefile.build:549: recipe for target 'drivers/gpu/drm/i915' failed make[3]: *** [drivers/gpu/drm/i915] Error 2 scripts/Makefile.build:549: recipe for target 'drivers/gpu/drm' failed make[2]: *** [drivers/gpu/drm] Error 2 scripts/Makefile.build:549: recipe for target 'drivers/gpu' failed make[1]: *** [drivers/gpu] Error 2 Makefile:1846: recipe for target 'drivers' failed make: *** [drivers] Error 2 ^ permalink raw reply [flat|nested] 10+ messages in thread
* [Intel-gfx] [v3 0/3] Introduce Raptor Lake S @ 2021-12-01 10:33 Anusha Srivatsa 2021-12-01 10:33 ` [Intel-gfx] [v3 3/3] drm/i915/rpl-s: Enable guc submission by default Anusha Srivatsa 0 siblings, 1 reply; 10+ messages in thread From: Anusha Srivatsa @ 2021-12-01 10:33 UTC (permalink / raw) To: intel-gfx 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). The series introduces it as a subplatform of ADL-S. The one difference is the GuC submission which is default on RPL-S but was not the case with ADL-S. Anusha Srivatsa (3): drm/i915/rpl-s: Add PCI IDS for Raptor Lake S drm/i915/rpl-s: Add PCH Support for Raptor Lake S drm/i915/rpl-s: Enable guc submission by default arch/x86/kernel/early-quirks.c | 1 + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/i915_pci.c | 1 + drivers/gpu/drm/i915/intel_device_info.c | 7 +++++++ drivers/gpu/drm/i915/intel_device_info.h | 3 +++ drivers/gpu/drm/i915/intel_pch.c | 1 + drivers/gpu/drm/i915/intel_pch.h | 1 + include/drm/i915_pciids.h | 9 +++++++++ 9 files changed, 26 insertions(+), 1 deletion(-) -- 2.25.1 ^ permalink raw reply [flat|nested] 10+ messages in thread
* [Intel-gfx] [v3 3/3] drm/i915/rpl-s: Enable guc submission by default 2021-12-01 10:33 [Intel-gfx] [v3 0/3] Introduce Raptor Lake S Anusha Srivatsa @ 2021-12-01 10:33 ` Anusha Srivatsa 2021-12-02 13:45 ` Souza, Jose 0 siblings, 1 reply; 10+ messages in thread From: Anusha Srivatsa @ 2021-12-01 10:33 UTC (permalink / raw) To: intel-gfx Though, RPL-S is defined as subplatform of ADL-S, unlike ADL-S, it has GuC submission by default. v2: Remove extra parenthesis (Jani) v3: s/IS_RAPTORLAKE/IS_ADLS_RPLS (Jani) Cc: Jani Nikula <jani.nikula@linux.intel.com> Cc: Swathi Dhanavanthri <swathi.dhanavanthri@intel.com> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com> --- drivers/gpu/drm/i915/gt/uc/intel_uc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c index 2fef3b0bbe95..8f17005ce85f 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c @@ -35,7 +35,7 @@ static void uc_expand_default_options(struct intel_uc *uc) } /* Intermediate platforms are HuC authentication only */ - if (IS_ALDERLAKE_S(i915)) { + if (IS_ALDERLAKE_S(i915) && !IS_ADLS_RPLS(i915)) { i915->params.enable_guc = ENABLE_GUC_LOAD_HUC; return; } -- 2.25.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [Intel-gfx] [v3 3/3] drm/i915/rpl-s: Enable guc submission by default 2021-12-01 10:33 ` [Intel-gfx] [v3 3/3] drm/i915/rpl-s: Enable guc submission by default Anusha Srivatsa @ 2021-12-02 13:45 ` Souza, Jose 0 siblings, 0 replies; 10+ messages in thread From: Souza, Jose @ 2021-12-02 13:45 UTC (permalink / raw) To: Srivatsa, Anusha, intel-gfx@lists.freedesktop.org On Wed, 2021-12-01 at 02:33 -0800, Anusha Srivatsa wrote: > Though, RPL-S is defined as subplatform of ADL-S, unlike > ADL-S, it has GuC submission by default. > > v2: Remove extra parenthesis (Jani) > v3: s/IS_RAPTORLAKE/IS_ADLS_RPLS (Jani) > Reviewed-by: José Roberto de Souza <jose.souza@intel.com> > Cc: Jani Nikula <jani.nikula@linux.intel.com> > Cc: Swathi Dhanavanthri <swathi.dhanavanthri@intel.com> > Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com> > --- > drivers/gpu/drm/i915/gt/uc/intel_uc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c > index 2fef3b0bbe95..8f17005ce85f 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c > @@ -35,7 +35,7 @@ static void uc_expand_default_options(struct intel_uc *uc) > } > > /* Intermediate platforms are HuC authentication only */ > - if (IS_ALDERLAKE_S(i915)) { > + if (IS_ALDERLAKE_S(i915) && !IS_ADLS_RPLS(i915)) { > i915->params.enable_guc = ENABLE_GUC_LOAD_HUC; > return; > } ^ permalink raw reply [flat|nested] 10+ messages in thread
* [Intel-gfx] [v3 0/3] Introduce Raptor Lake S @ 2021-12-03 6:35 Anusha Srivatsa 2021-12-03 6:35 ` [Intel-gfx] [v3 3/3] drm/i915/rpl-s: Enable guc submission by default Anusha Srivatsa 0 siblings, 1 reply; 10+ messages in thread From: Anusha Srivatsa @ 2021-12-03 6:35 UTC (permalink / raw) To: intel-gfx Cc: Jani Nikula, x86, dri-devel, Dave Hansen, Ingo Molnar, Borislav Petkov 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). The series introduces it as a subplatform of ADL-S. The one difference is the GuC submission which is default on RPL-S but was not the case with ADL-S. All patches are reviewed. Jani has acked the series. Looking for other acks in order to merge these to respective branches. 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> Acked-by: Jani Nikula <jani.nikula@intel.com> Anusha Srivatsa (3): drm/i915/rpl-s: Add PCI IDS for Raptor Lake S drm/i915/rpl-s: Add PCH Support for Raptor Lake S drm/i915/rpl-s: Enable guc submission by default arch/x86/kernel/early-quirks.c | 1 + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/i915_pci.c | 1 + drivers/gpu/drm/i915/intel_device_info.c | 7 +++++++ drivers/gpu/drm/i915/intel_device_info.h | 3 +++ drivers/gpu/drm/i915/intel_pch.c | 1 + drivers/gpu/drm/i915/intel_pch.h | 1 + include/drm/i915_pciids.h | 9 +++++++++ 9 files changed, 26 insertions(+), 1 deletion(-) -- 2.25.1 ^ permalink raw reply [flat|nested] 10+ messages in thread
* [Intel-gfx] [v3 3/3] drm/i915/rpl-s: Enable guc submission by default 2021-12-03 6:35 [Intel-gfx] [v3 0/3] Introduce Raptor Lake S Anusha Srivatsa @ 2021-12-03 6:35 ` Anusha Srivatsa 0 siblings, 0 replies; 10+ messages in thread From: Anusha Srivatsa @ 2021-12-03 6:35 UTC (permalink / raw) To: intel-gfx; +Cc: dri-devel Though, RPL-S is defined as subplatform of ADL-S, unlike ADL-S, it has GuC submission by default. v2: Remove extra parenthesis (Jani) v3: s/IS_RAPTORLAKE/IS_ADLS_RPLS (Jani) Cc: dri-devel@lists.freedesktop.org Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> Cc: Jani Nikula <jani.nikula@linux.intel.com> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com> Reviewed-by: José Roberto de Souza <jose.souza@intel.com> --- drivers/gpu/drm/i915/gt/uc/intel_uc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c index 2fef3b0bbe95..8f17005ce85f 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c @@ -35,7 +35,7 @@ static void uc_expand_default_options(struct intel_uc *uc) } /* Intermediate platforms are HuC authentication only */ - if (IS_ALDERLAKE_S(i915)) { + if (IS_ALDERLAKE_S(i915) && !IS_ADLS_RPLS(i915)) { i915->params.enable_guc = ENABLE_GUC_LOAD_HUC; return; } -- 2.25.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2021-12-03 6:37 UTC | newest] Thread overview: 10+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2021-12-01 7:00 [Intel-gfx] [v3 0/3] Introduce Raptor Lake S Anusha Srivatsa 2021-12-01 7:00 ` [Intel-gfx] [v3 1/3] drm/i915/rpl-s: Add PCI IDS for " Anusha Srivatsa 2021-12-01 7:00 ` [Intel-gfx] [v3 2/3] drm/i915/rpl-s: Add PCH Support " Anusha Srivatsa 2021-12-01 7:00 ` [Intel-gfx] [v3 3/3] drm/i915/rpl-s: Enable guc submission by default Anusha Srivatsa 2021-12-01 9:15 ` Jani Nikula 2021-12-01 9:45 ` Srivatsa, Anusha 2021-12-01 7:15 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for Introduce Raptor Lake S (rev3) Patchwork -- strict thread matches above, loose matches on Subject: below -- 2021-12-01 10:33 [Intel-gfx] [v3 0/3] Introduce Raptor Lake S Anusha Srivatsa 2021-12-01 10:33 ` [Intel-gfx] [v3 3/3] drm/i915/rpl-s: Enable guc submission by default Anusha Srivatsa 2021-12-02 13:45 ` Souza, Jose 2021-12-03 6:35 [Intel-gfx] [v3 0/3] Introduce Raptor Lake S Anusha Srivatsa 2021-12-03 6:35 ` [Intel-gfx] [v3 3/3] drm/i915/rpl-s: Enable guc submission by default Anusha Srivatsa
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox