Re: [Intel-gfx] [v2 1/3] drm/i915/rpl-s: Add PCI IDS for Raptor Lake S

["Srivatsa, Anusha" <anusha.srivatsa@intel.com>]

> -----Original Message-----
> From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
> Sent: Monday, November 22, 2021 3:49 PM
> To: Srivatsa, Anusha <anusha.srivatsa@intel.com>; intel-
> gfx@lists.freedesktop.org
> Subject: Re: [Intel-gfx] [v2 1/3] drm/i915/rpl-s: Add PCI IDS for Raptor Lake S
> 
> 
> On 20/11/2021 00:29, Anusha Srivatsa wrote:
> > 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)
> >
> > BSpec: 53655
> > Cc: Matt Roper <matthew.d.roper@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..c53da07255c5
> > 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_RAPTORLAKE_S(dev_priv) \
> > +	IS_SUBPLATFORM(dev_priv, INTEL_ALDERLAKE_S,
> INTEL_SUBPLATFORM_RPL)
> >   #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..565b50c3f34f 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_rpl_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_rpl_ids,
> > +			      ARRAY_SIZE(subplatform_rpl_ids))) {
> > +		mask = BIT(INTEL_SUBPLATFORM_RPL);
> >   	}
> >
> >   	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..186e773fd0da 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
> >
> > +/* RPL */
> > +#define INTEL_SUBPLATFORM_RPL	0
> 
> Comment is wrong as said before. Comment should say to which platform
> the subplatform bits apply. It cannot apply to itself since RPL platform does
> not exist.
That is correct. Good catch. I ll fix this.

Thanks Tvrtko.
Anusha
> 
> Regards,
> 
> Tvrtko
> 
> > +
> >   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 */
> >