[Intel-gfx] [PATCH V3] drm/i915/adl-n: Enable ADL-N platform

[Lucas De Marchi]

On Fri, Dec 17, 2021 at 03:27:57PM +0200, Jani Nikula wrote:
>On Fri, 10 Dec 2021, Tejas Upadhyay <tejaskumarx.surendrakumar.upadhyay at intel.com> wrote:
>> 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 <tejaskumarx.surendrakumar.upadhyay at intel.com>
>
>Cc: x86 maintainers & lists
>
>Ack for merging the arch/x86/kernel/early-quirks.c PCI ID update via
>drm-intel?
>
>I note not all such changes in git log have your acks recorded, though
>most do. Do you want us to be more careful about Cc'ing you for acks on
>PCI ID changes every time going forward?

That's what Borislav asked in
https://lore.kernel.org/all/20200520093025.GD1457@zn.tnic/

Lucas De Marchi

>
>BR,
>Jani.
>
>
>> ---
>>  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                | 6 ++++++
>>  6 files changed, 20 insertions(+)
>>
>> diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
>> index fd2d3ab38ebb..1ca3a56fdc2d 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_ADLN_IDS(&gen11_early_ops),
>>  	INTEL_RPLS_IDS(&gen11_early_ops),
>>  };
>>
>> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
>> index a0f54a69b11d..b2ec85a3e40a 100644
>> --- a/drivers/gpu/drm/i915/i915_drv.h
>> +++ b/drivers/gpu/drm/i915/i915_drv.h
>> @@ -1283,6 +1283,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) \
>> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
>> index 708a23415e9c..6a19e9da53cc 100644
>> --- a/drivers/gpu/drm/i915/i915_pci.c
>> +++ b/drivers/gpu/drm/i915/i915_pci.c
>> @@ -1132,6 +1132,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}
>> diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
>> index a3446a2abcb2..54944d87cd3c 100644
>> --- a/drivers/gpu/drm/i915/intel_device_info.c
>> +++ b/drivers/gpu/drm/i915/intel_device_info.c
>> @@ -170,6 +170,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),
>>  };
>> @@ -210,6 +214,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);
>> diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h
>> index 213ae2c07126..e341d90f28a2 100644
>> --- a/drivers/gpu/drm/i915/intel_device_info.h
>> +++ b/drivers/gpu/drm/i915/intel_device_info.h
>> @@ -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,
>> diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
>> index baf3d1d3d566..533890dc9da1 100644
>> --- a/include/drm/i915_pciids.h
>> +++ b/include/drm/i915_pciids.h
>> @@ -666,6 +666,12 @@
>>  	INTEL_VGA_DEVICE(0x46C2, info), \
>>  	INTEL_VGA_DEVICE(0x46C3, info)
>>
>> +/* ADL-N */
>> +#define INTEL_ADLN_IDS(info) \
>> +	INTEL_VGA_DEVICE(0x46D0, info), \
>> +	INTEL_VGA_DEVICE(0x46D1, info), \
>> +	INTEL_VGA_DEVICE(0x46D2, info)
>> +
>>  /* RPL-S */
>>  #define INTEL_RPLS_IDS(info) \
>>  	INTEL_VGA_DEVICE(0xA780, info), \
>
>-- 
>Jani Nikula, Intel Open Source Graphics Center