[PATCH] lib: sync i915_pciids.h with kernel

[PATCH] lib: sync i915_pciids.h with kernel

[Ravi Kumar Vodapalli]

This synchronizes with kernel commit
	2bcf0f9bb33d ("drm/i915: Add new PCI IDs to DG2 platform in driver")

Signed-off-by: Ravi Kumar Vodapalli <ravi.kumar.vodapalli@intel.com>
---
 lib/i915_pciids.h | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h
index fcf1849aa..85ce33ad6 100644
--- a/lib/i915_pciids.h
+++ b/lib/i915_pciids.h
@@ -672,7 +672,9 @@
 #define INTEL_ADLN_IDS(info) \
 	INTEL_VGA_DEVICE(0x46D0, info), \
 	INTEL_VGA_DEVICE(0x46D1, info), \
-	INTEL_VGA_DEVICE(0x46D2, info)
+	INTEL_VGA_DEVICE(0x46D2, info), \
+	INTEL_VGA_DEVICE(0x46D3, info), \
+	INTEL_VGA_DEVICE(0x46D4, info)
 
 /* RPL-S */
 #define INTEL_RPLS_IDS(info) \
@@ -709,7 +711,9 @@
 	INTEL_VGA_DEVICE(0x5692, info), \
 	INTEL_VGA_DEVICE(0x56A0, info), \
 	INTEL_VGA_DEVICE(0x56A1, info), \
-	INTEL_VGA_DEVICE(0x56A2, info)
+	INTEL_VGA_DEVICE(0x56A2, info), \
+	INTEL_VGA_DEVICE(0x56BE, info), \
+	INTEL_VGA_DEVICE(0x56BF, info)
 
 #define INTEL_DG2_G11_IDS(info) \
 	INTEL_VGA_DEVICE(0x5693, info), \
@@ -751,10 +755,13 @@
 /* MTL */
 #define INTEL_MTL_IDS(info) \
 	INTEL_VGA_DEVICE(0x7D40, info), \
+	INTEL_VGA_DEVICE(0x7D41, info), \
 	INTEL_VGA_DEVICE(0x7D45, info), \
+	INTEL_VGA_DEVICE(0x7D51, info), \
 	INTEL_VGA_DEVICE(0x7D55, info), \
 	INTEL_VGA_DEVICE(0x7D60, info), \
 	INTEL_VGA_DEVICE(0x7D67, info), \
+	INTEL_VGA_DEVICE(0x7DD1, info), \
 	INTEL_VGA_DEVICE(0x7DD5, info)
 
 #endif /* _I915_PCIIDS_H */
-- 
2.25.1

✓ CI.xeBAT: success for lib: sync i915_pciids.h with kernel (rev16)

[Patchwork]

[-- Attachment #1: Type: text/plain, Size: 3185 bytes --]

== Series Details ==

Series: lib: sync i915_pciids.h with kernel (rev16)
URL   : https://patchwork.freedesktop.org/series/50957/
State : success

== Summary ==

CI Bug Log - changes from XEIGT_7786_BAT -> XEIGTPW_10934_BAT
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

  

Participating hosts (5 -> 4)
------------------------------

  Missing    (1): bat-lnl-1 

Known issues
------------

  Here are the changes found in XEIGTPW_10934_BAT that come from known issues:

### IGT changes ###

#### Possible fixes ####

  * igt@xe_dma_buf_sync@export-dma-buf-once:
    - bat-dg2-oem2:       [SKIP][1] ([Intel XE#1130]) -> [PASS][2] +9 other tests pass
   [1]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7786/bat-dg2-oem2/igt@xe_dma_buf_sync@export-dma-buf-once.html
   [2]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10934/bat-dg2-oem2/igt@xe_dma_buf_sync@export-dma-buf-once.html

  * igt@xe_module_load@load:
    - bat-dg2-oem2:       [FAIL][3] ([Intel XE#1132]) -> [PASS][4]
   [3]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7786/bat-dg2-oem2/igt@xe_module_load@load.html
   [4]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10934/bat-dg2-oem2/igt@xe_module_load@load.html

  
#### Warnings ####

  * igt@xe_evict@evict-beng-mixed-threads-small-multi-vm:
    - bat-dg2-oem2:       [SKIP][5] ([Intel XE#1130]) -> [INCOMPLETE][6] ([Intel XE#804])
   [5]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7786/bat-dg2-oem2/igt@xe_evict@evict-beng-mixed-threads-small-multi-vm.html
   [6]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10934/bat-dg2-oem2/igt@xe_evict@evict-beng-mixed-threads-small-multi-vm.html

  * igt@xe_exec_threads@threads-mixed-userptr-invalidate:
    - bat-adlp-7:         [INCOMPLETE][7] ([Intel XE#1044]) -> [INCOMPLETE][8] ([Intel XE#1044] / [Intel XE#1376])
   [7]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7786/bat-adlp-7/igt@xe_exec_threads@threads-mixed-userptr-invalidate.html
   [8]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10934/bat-adlp-7/igt@xe_exec_threads@threads-mixed-userptr-invalidate.html

  
  [Intel XE#1044]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1044
  [Intel XE#1130]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1130
  [Intel XE#1132]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1132
  [Intel XE#1376]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1376
  [Intel XE#804]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/804


Build changes
-------------

  * IGT: IGT_7786 -> IGTPW_10934
  * Linux: xe-998-f9c56f1a03b5c35488671e4ffe61e28b12ffe163 -> xe-1004-07c774152cf8a034784b40978a77b5ee66e4779b

  IGTPW_10934: f418cf188a1c671f44fb1869e9f00dab55564200 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
  IGT_7786: 1e4a3cd0a4bb3419fb70ed3e01259485b056dcfd @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
  xe-1004-07c774152cf8a034784b40978a77b5ee66e4779b: 07c774152cf8a034784b40978a77b5ee66e4779b
  xe-998-f9c56f1a03b5c35488671e4ffe61e28b12ffe163: f9c56f1a03b5c35488671e4ffe61e28b12ffe163

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10934/index.html

[-- Attachment #2: Type: text/html, Size: 3982 bytes --]

Re: [PATCH] lib: sync i915_pciids.h with kernel

[Matt Roper]

On Thu, Mar 28, 2024 at 01:42:32AM +0530, Ravi Kumar Vodapalli wrote:
> This synchronizes with kernel commit
> 	2bcf0f9bb33d ("drm/i915: Add new PCI IDs to DG2 platform in driver")
> 
> Signed-off-by: Ravi Kumar Vodapalli <ravi.kumar.vodapalli@intel.com>

Reviewed-by: Matt Roper <matthew.d.roper@intel.com>

and applied to master.  Thanks for the patch.


Matt

> ---
>  lib/i915_pciids.h | 11 +++++++++--
>  1 file changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h
> index fcf1849aa..85ce33ad6 100644
> --- a/lib/i915_pciids.h
> +++ b/lib/i915_pciids.h
> @@ -672,7 +672,9 @@
>  #define INTEL_ADLN_IDS(info) \
>  	INTEL_VGA_DEVICE(0x46D0, info), \
>  	INTEL_VGA_DEVICE(0x46D1, info), \
> -	INTEL_VGA_DEVICE(0x46D2, info)
> +	INTEL_VGA_DEVICE(0x46D2, info), \
> +	INTEL_VGA_DEVICE(0x46D3, info), \
> +	INTEL_VGA_DEVICE(0x46D4, info)
>  
>  /* RPL-S */
>  #define INTEL_RPLS_IDS(info) \
> @@ -709,7 +711,9 @@
>  	INTEL_VGA_DEVICE(0x5692, info), \
>  	INTEL_VGA_DEVICE(0x56A0, info), \
>  	INTEL_VGA_DEVICE(0x56A1, info), \
> -	INTEL_VGA_DEVICE(0x56A2, info)
> +	INTEL_VGA_DEVICE(0x56A2, info), \
> +	INTEL_VGA_DEVICE(0x56BE, info), \
> +	INTEL_VGA_DEVICE(0x56BF, info)
>  
>  #define INTEL_DG2_G11_IDS(info) \
>  	INTEL_VGA_DEVICE(0x5693, info), \
> @@ -751,10 +755,13 @@
>  /* MTL */
>  #define INTEL_MTL_IDS(info) \
>  	INTEL_VGA_DEVICE(0x7D40, info), \
> +	INTEL_VGA_DEVICE(0x7D41, info), \
>  	INTEL_VGA_DEVICE(0x7D45, info), \
> +	INTEL_VGA_DEVICE(0x7D51, info), \
>  	INTEL_VGA_DEVICE(0x7D55, info), \
>  	INTEL_VGA_DEVICE(0x7D60, info), \
>  	INTEL_VGA_DEVICE(0x7D67, info), \
> +	INTEL_VGA_DEVICE(0x7DD1, info), \
>  	INTEL_VGA_DEVICE(0x7DD5, info)
>  
>  #endif /* _I915_PCIIDS_H */
> -- 
> 2.25.1
> 

-- 
Matt Roper
Graphics Software Engineer
Linux GPU Platform Enablement
Intel Corporation

Re: [PATCH] lib: sync i915_pciids.h with kernel

[Jani Nikula]

On Fri, 05 Jan 2024, Lionel Landwerlin <lionel.g.landwerlin@intel.com> wrote:
> On 05/01/2024 15:26, Jani Nikula wrote:
>> On Fri, 22 Dec 2023, Lionel Landwerlin <lionel.g.landwerlin@intel.com> wrote:
>>> The reason we need to differentiate GT2/GT3 skus is that they require a
>>> different programming to get performance metrics.
>> Please explain why this isn't abstracted in the kernel, and why this
>> needs PCI ID level identification in userspace.
>>
>> BR,
>> Jani.
>
>
> You want us to elaborate on "require a different programming" ?

My emphasis was on "abstracted in the kernel", and I was kind of quickly
asking Explain Like I'm Five.

Now I looked at the xml and codegen under lib/i915/perf-configs, and
kind of figured why this isn't abstracted in the kernel. :p

Never mind.


BR,
Jani.


-- 
Jani Nikula, Intel

Re: [PATCH] lib: sync i915_pciids.h with kernel

[Lionel Landwerlin]

On 05/01/2024 15:26, Jani Nikula wrote:
> On Fri, 22 Dec 2023, Lionel Landwerlin <lionel.g.landwerlin@intel.com> wrote:
>> The reason we need to differentiate GT2/GT3 skus is that they require a
>> different programming to get performance metrics.
> Please explain why this isn't abstracted in the kernel, and why this
> needs PCI ID level identification in userspace.
>
> BR,
> Jani.


You want us to elaborate on "require a different programming" ?


-Lionel

Re: [PATCH] lib: sync i915_pciids.h with kernel

[Jani Nikula]

On Fri, 22 Dec 2023, Lionel Landwerlin <lionel.g.landwerlin@intel.com> wrote:
> The reason we need to differentiate GT2/GT3 skus is that they require a 
> different programming to get performance metrics.

Please explain why this isn't abstracted in the kernel, and why this
needs PCI ID level identification in userspace.

BR,
Jani.


-- 
Jani Nikula, Intel

Re: [PATCH] lib: sync i915_pciids.h with kernel

[Lionel Landwerlin]

On 19/12/2023 09:00, Kamil Konieczny wrote:
> Hi,
>
> On 2023-12-19 at 05:43:13 +0000, Borah, Chaitanya Kumar wrote:
>> Hello,
>>
>>> -----Original Message-----
>>> From: Kamil Konieczny <kamil.konieczny@linux.intel.com>
>>> Sent: Monday, December 18, 2023 9:49 PM
>>> To: igt-dev@lists.freedesktop.org
>>> Cc: Borah, Chaitanya Kumar <chaitanya.kumar.borah@intel.com>; Juha-Pekka
>>> Heikkila <juhapekka.heikkila@gmail.com>; Garg, Nemesa
>>> <nemesa.garg@intel.com>
>>> Subject: Re: [PATCH] lib: sync i915_pciids.h with kernel
>>>
>>> Hi,
>>>
>>> On 2023-12-18 at 10:14:34 +0000, Borah, Chaitanya Kumar wrote:
>>>> Hello Kamil,
>>>>
>>>>> -----Original Message-----
>>>>> From: Kamil Konieczny <kamil.konieczny@linux.intel.com>
>>>>> Sent: Thursday, December 14, 2023 8:06 PM
>>>>> To: igt-dev@lists.freedesktop.org
>>>>> Cc: Borah, Chaitanya Kumar <chaitanya.kumar.borah@intel.com>;
>>>>> Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>; Garg, Nemesa
>>>>> <nemesa.garg@intel.com>
>>>>> Subject: Re: [PATCH] lib: sync i915_pciids.h with kernel
>>>>>
>>>>> Hi,
>>>>>
>>>>> On 2023-12-14 at 04:48:27 +0000, Borah, Chaitanya Kumar wrote:
>>>>>> Hello JP,
>>>>>>
>>>>>>> -----Original Message-----
>>>>>>> From: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
>>>>>>> Sent: Wednesday, December 13, 2023 6:47 PM
>>>>>>> To: Borah, Chaitanya Kumar <chaitanya.kumar.borah@intel.com>;
>>>>>>> igt- dev@lists.freedesktop.org
>>>>>>> Cc: Garg, Nemesa <nemesa.garg@intel.com>
>>>>>>> Subject: Re: [PATCH] lib: sync i915_pciids.h with kernel
>>>>>>>
>>>>>>> This is not correct. This does not synchronize with kernel commit.
>>>>>>> i915_pciids.h is supposed to be copied as is from kernel.
>>>>>> This has crossed my mind but there are a lot of changes[1]
>>>>>> unrelated to
>>>>> ARL-S if we just copy the file.
>>>>>> Therefore, it made me a bit uncomfortable. Should I go ahead anyway?
>>>>>>
>>>>>> At least for PVC device ids, we might have to take an exception.
>>>>>> Or may be
>>>>> they did not belong there in the first place.
>>>>> You may add only ARL-S but then write in subject what you did as it
>>>>> is not syncing, for example:
>>>>>
>>>>> [PATCH] lib/i915_pciids: Add ARL-S
>>>>>
>>>>> and describe why you added only that. Write also which commit (hash
>>>>> and
>>>>> subject) you used (working link could also help).
>>>>>
>>>>> One more thing: why not adding all without removing PVC ids?
>>>>>
>>>> Actually, I will go ahead and do that. I will post a patch soon.
>>>>
>> +Matt, Lionel
>>
>> Spoke to soon! We are running into build errors for MTL PCI IDs as the kernel does not define the macros
>>
>> INTEL_MTL_P_GT2_IDS
>> INTEL_MTL_P_GT3_IDS
>>
>> I am not sure how to handle this now. Make an exception for MTL too? Or Should these changes be added back to the kernel header?
>>
> Looks like it can be deleted from lib perf.c?
> Please verify such change on MTL.
>
> Regards,
> Kamil


Not sure what you're proposing on deleting.

Performance metric support/testing all MTL platforms?


The reason we need to differentiate GT2/GT3 skus is that they require a 
different programming to get performance metrics.

I can't say what is best here. Different headers between kernel & IGT or 
make the kernel carry this change too?

I'm sure some people are going to complain either way :)


-Lionel


>
>> ../lib/i915/perf.c: In function ‘is_mtl_gt2’:
>> ../lib/i915/perf.c:216:3: error: implicit declaration of function ‘INTEL_MTL_M_IDS’; did you mean ‘INTEL_MTL_IDS’? [-Werror=implicit-function-declaration]
>>    216 |   INTEL_MTL_M_IDS(NULL),
>>        |   ^~~~~~~~~~~~~~~
>>        |   INTEL_MTL_IDS
>> ../lib/i915/perf.c:216:3: warning: nested extern declaration of ‘INTEL_MTL_M_IDS’ [-Wnested-externs]
>> ../lib/i915/perf.c:216:3: error: initializer element is not constant
>> ../lib/i915/perf.c:216:3: note: (near initialization for ‘devids[0]’)
>> ../lib/i915/perf.c:217:3: error: implicit declaration of function ‘INTEL_MTL_P_GT2_IDS’; did you mean ‘INTEL_CFL_U_GT2_IDS’? [-Werror=implicit-function-declaration]
>>    217 |   INTEL_MTL_P_GT2_IDS(NULL),
>>        |   ^~~~~~~~~~~~~~~~~~~
>>        |   INTEL_CFL_U_GT2_IDS
>> ../lib/i915/perf.c:217:3: warning: nested extern declaration of ‘INTEL_MTL_P_GT2_IDS’ [-Wnested-externs]
>> ../lib/i915/perf.c:217:3: error: initializer element is not constant
>> ../lib/i915/perf.c:217:3: note: (near initialization for ‘devids[1]’)
>> ../lib/i915/perf.c: In function ‘is_mtl_gt3’:
>> ../lib/i915/perf.c:234:3: error: implicit declaration of function ‘INTEL_MTL_P_GT3_IDS’; did you mean ‘INTEL_WHL_U_GT3_IDS’? [-Werror=implicit-function-declaration]
>>    234 |   INTEL_MTL_P_GT3_IDS(NULL),
>>        |   ^~~~~~~~~~~~~~~~~~~
>>        |   INTEL_WHL_U_GT3_IDS
>> ../lib/i915/perf.c:234:3: warning: nested extern declaration of ‘INTEL_MTL_P_GT3_IDS’ [-Wnested-externs]
>> ../lib/i915/perf.c:234:3: error: initializer element is not constant
>> ../lib/i915/perf.c:234:3: note: (near initialization for ‘devids[0]’)
>>
>>>> Regards
>>>>
>>>> Chaitanya
>>> Last thing, please add i-g-t in subject after PATCH, so it will be:
>>>
>>> [PATCH i-g-t] describe here your patch
>>>
>> Ack.
>>
>> Regards
>>
>> Chaitanya
>>
>>> Regards,
>>> Kamil
>>>
>>> [...cut...]

Re: [PATCH] lib: sync i915_pciids.h with kernel

[Kamil Konieczny]

Hi,

On 2023-12-19 at 05:43:13 +0000, Borah, Chaitanya Kumar wrote:
> Hello,
> 
> > -----Original Message-----
> > From: Kamil Konieczny <kamil.konieczny@linux.intel.com>
> > Sent: Monday, December 18, 2023 9:49 PM
> > To: igt-dev@lists.freedesktop.org
> > Cc: Borah, Chaitanya Kumar <chaitanya.kumar.borah@intel.com>; Juha-Pekka
> > Heikkila <juhapekka.heikkila@gmail.com>; Garg, Nemesa
> > <nemesa.garg@intel.com>
> > Subject: Re: [PATCH] lib: sync i915_pciids.h with kernel
> > 
> > Hi,
> > 
> > On 2023-12-18 at 10:14:34 +0000, Borah, Chaitanya Kumar wrote:
> > > Hello Kamil,
> > >
> > > > -----Original Message-----
> > > > From: Kamil Konieczny <kamil.konieczny@linux.intel.com>
> > > > Sent: Thursday, December 14, 2023 8:06 PM
> > > > To: igt-dev@lists.freedesktop.org
> > > > Cc: Borah, Chaitanya Kumar <chaitanya.kumar.borah@intel.com>;
> > > > Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>; Garg, Nemesa
> > > > <nemesa.garg@intel.com>
> > > > Subject: Re: [PATCH] lib: sync i915_pciids.h with kernel
> > > >
> > > > Hi,
> > > >
> > > > On 2023-12-14 at 04:48:27 +0000, Borah, Chaitanya Kumar wrote:
> > > > > Hello JP,
> > > > >
> > > > > > -----Original Message-----
> > > > > > From: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
> > > > > > Sent: Wednesday, December 13, 2023 6:47 PM
> > > > > > To: Borah, Chaitanya Kumar <chaitanya.kumar.borah@intel.com>;
> > > > > > igt- dev@lists.freedesktop.org
> > > > > > Cc: Garg, Nemesa <nemesa.garg@intel.com>
> > > > > > Subject: Re: [PATCH] lib: sync i915_pciids.h with kernel
> > > > > >
> > > > > > This is not correct. This does not synchronize with kernel commit.
> > > > > > i915_pciids.h is supposed to be copied as is from kernel.
> > > > >
> > > > > This has crossed my mind but there are a lot of changes[1]
> > > > > unrelated to
> > > > ARL-S if we just copy the file.
> > > > > Therefore, it made me a bit uncomfortable. Should I go ahead anyway?
> > > > >
> > > > > At least for PVC device ids, we might have to take an exception.
> > > > > Or may be
> > > > they did not belong there in the first place.
> > > > >
> > > >
> > > > You may add only ARL-S but then write in subject what you did as it
> > > > is not syncing, for example:
> > > >
> > > > [PATCH] lib/i915_pciids: Add ARL-S
> > > >
> > > > and describe why you added only that. Write also which commit (hash
> > > > and
> > > > subject) you used (working link could also help).
> > > >
> > > > One more thing: why not adding all without removing PVC ids?
> > > >
> > >
> > > Actually, I will go ahead and do that. I will post a patch soon.
> > >
> 
> +Matt, Lionel
> 
> Spoke to soon! We are running into build errors for MTL PCI IDs as the kernel does not define the macros
> 
> INTEL_MTL_P_GT2_IDS
> INTEL_MTL_P_GT3_IDS
> 
> I am not sure how to handle this now. Make an exception for MTL too? Or Should these changes be added back to the kernel header?
> 

Looks like it can be deleted from lib perf.c?
Please verify such change on MTL.

Regards,
Kamil

> 
> ../lib/i915/perf.c: In function ‘is_mtl_gt2’:
> ../lib/i915/perf.c:216:3: error: implicit declaration of function ‘INTEL_MTL_M_IDS’; did you mean ‘INTEL_MTL_IDS’? [-Werror=implicit-function-declaration]
>   216 |   INTEL_MTL_M_IDS(NULL),
>       |   ^~~~~~~~~~~~~~~
>       |   INTEL_MTL_IDS
> ../lib/i915/perf.c:216:3: warning: nested extern declaration of ‘INTEL_MTL_M_IDS’ [-Wnested-externs]
> ../lib/i915/perf.c:216:3: error: initializer element is not constant
> ../lib/i915/perf.c:216:3: note: (near initialization for ‘devids[0]’)
> ../lib/i915/perf.c:217:3: error: implicit declaration of function ‘INTEL_MTL_P_GT2_IDS’; did you mean ‘INTEL_CFL_U_GT2_IDS’? [-Werror=implicit-function-declaration]
>   217 |   INTEL_MTL_P_GT2_IDS(NULL),
>       |   ^~~~~~~~~~~~~~~~~~~
>       |   INTEL_CFL_U_GT2_IDS
> ../lib/i915/perf.c:217:3: warning: nested extern declaration of ‘INTEL_MTL_P_GT2_IDS’ [-Wnested-externs]
> ../lib/i915/perf.c:217:3: error: initializer element is not constant
> ../lib/i915/perf.c:217:3: note: (near initialization for ‘devids[1]’)
> ../lib/i915/perf.c: In function ‘is_mtl_gt3’:
> ../lib/i915/perf.c:234:3: error: implicit declaration of function ‘INTEL_MTL_P_GT3_IDS’; did you mean ‘INTEL_WHL_U_GT3_IDS’? [-Werror=implicit-function-declaration]
>   234 |   INTEL_MTL_P_GT3_IDS(NULL),
>       |   ^~~~~~~~~~~~~~~~~~~
>       |   INTEL_WHL_U_GT3_IDS
> ../lib/i915/perf.c:234:3: warning: nested extern declaration of ‘INTEL_MTL_P_GT3_IDS’ [-Wnested-externs]
> ../lib/i915/perf.c:234:3: error: initializer element is not constant
> ../lib/i915/perf.c:234:3: note: (near initialization for ‘devids[0]’)
> 
> > > Regards
> > >
> > > Chaitanya
> > 
> > Last thing, please add i-g-t in subject after PATCH, so it will be:
> > 
> > [PATCH i-g-t] describe here your patch
> > 
> 
> Ack.
> 
> Regards
> 
> Chaitanya
> 
> > Regards,
> > Kamil
> > 
> > [...cut...]
> 

RE: [PATCH] lib: sync i915_pciids.h with kernel

[Borah, Chaitanya Kumar]

Hello,

> -----Original Message-----
> From: Kamil Konieczny <kamil.konieczny@linux.intel.com>
> Sent: Monday, December 18, 2023 9:49 PM
> To: igt-dev@lists.freedesktop.org
> Cc: Borah, Chaitanya Kumar <chaitanya.kumar.borah@intel.com>; Juha-Pekka
> Heikkila <juhapekka.heikkila@gmail.com>; Garg, Nemesa
> <nemesa.garg@intel.com>
> Subject: Re: [PATCH] lib: sync i915_pciids.h with kernel
> 
> Hi,
> 
> On 2023-12-18 at 10:14:34 +0000, Borah, Chaitanya Kumar wrote:
> > Hello Kamil,
> >
> > > -----Original Message-----
> > > From: Kamil Konieczny <kamil.konieczny@linux.intel.com>
> > > Sent: Thursday, December 14, 2023 8:06 PM
> > > To: igt-dev@lists.freedesktop.org
> > > Cc: Borah, Chaitanya Kumar <chaitanya.kumar.borah@intel.com>;
> > > Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>; Garg, Nemesa
> > > <nemesa.garg@intel.com>
> > > Subject: Re: [PATCH] lib: sync i915_pciids.h with kernel
> > >
> > > Hi,
> > >
> > > On 2023-12-14 at 04:48:27 +0000, Borah, Chaitanya Kumar wrote:
> > > > Hello JP,
> > > >
> > > > > -----Original Message-----
> > > > > From: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
> > > > > Sent: Wednesday, December 13, 2023 6:47 PM
> > > > > To: Borah, Chaitanya Kumar <chaitanya.kumar.borah@intel.com>;
> > > > > igt- dev@lists.freedesktop.org
> > > > > Cc: Garg, Nemesa <nemesa.garg@intel.com>
> > > > > Subject: Re: [PATCH] lib: sync i915_pciids.h with kernel
> > > > >
> > > > > This is not correct. This does not synchronize with kernel commit.
> > > > > i915_pciids.h is supposed to be copied as is from kernel.
> > > >
> > > > This has crossed my mind but there are a lot of changes[1]
> > > > unrelated to
> > > ARL-S if we just copy the file.
> > > > Therefore, it made me a bit uncomfortable. Should I go ahead anyway?
> > > >
> > > > At least for PVC device ids, we might have to take an exception.
> > > > Or may be
> > > they did not belong there in the first place.
> > > >
> > >
> > > You may add only ARL-S but then write in subject what you did as it
> > > is not syncing, for example:
> > >
> > > [PATCH] lib/i915_pciids: Add ARL-S
> > >
> > > and describe why you added only that. Write also which commit (hash
> > > and
> > > subject) you used (working link could also help).
> > >
> > > One more thing: why not adding all without removing PVC ids?
> > >
> >
> > Actually, I will go ahead and do that. I will post a patch soon.
> >

+Matt, Lionel

Spoke to soon! We are running into build errors for MTL PCI IDs as the kernel does not define the macros

INTEL_MTL_P_GT2_IDS
INTEL_MTL_P_GT3_IDS

I am not sure how to handle this now. Make an exception for MTL too? Or Should these changes be added back to the kernel header?


../lib/i915/perf.c: In function ‘is_mtl_gt2’:
../lib/i915/perf.c:216:3: error: implicit declaration of function ‘INTEL_MTL_M_IDS’; did you mean ‘INTEL_MTL_IDS’? [-Werror=implicit-function-declaration]
  216 |   INTEL_MTL_M_IDS(NULL),
      |   ^~~~~~~~~~~~~~~
      |   INTEL_MTL_IDS
../lib/i915/perf.c:216:3: warning: nested extern declaration of ‘INTEL_MTL_M_IDS’ [-Wnested-externs]
../lib/i915/perf.c:216:3: error: initializer element is not constant
../lib/i915/perf.c:216:3: note: (near initialization for ‘devids[0]’)
../lib/i915/perf.c:217:3: error: implicit declaration of function ‘INTEL_MTL_P_GT2_IDS’; did you mean ‘INTEL_CFL_U_GT2_IDS’? [-Werror=implicit-function-declaration]
  217 |   INTEL_MTL_P_GT2_IDS(NULL),
      |   ^~~~~~~~~~~~~~~~~~~
      |   INTEL_CFL_U_GT2_IDS
../lib/i915/perf.c:217:3: warning: nested extern declaration of ‘INTEL_MTL_P_GT2_IDS’ [-Wnested-externs]
../lib/i915/perf.c:217:3: error: initializer element is not constant
../lib/i915/perf.c:217:3: note: (near initialization for ‘devids[1]’)
../lib/i915/perf.c: In function ‘is_mtl_gt3’:
../lib/i915/perf.c:234:3: error: implicit declaration of function ‘INTEL_MTL_P_GT3_IDS’; did you mean ‘INTEL_WHL_U_GT3_IDS’? [-Werror=implicit-function-declaration]
  234 |   INTEL_MTL_P_GT3_IDS(NULL),
      |   ^~~~~~~~~~~~~~~~~~~
      |   INTEL_WHL_U_GT3_IDS
../lib/i915/perf.c:234:3: warning: nested extern declaration of ‘INTEL_MTL_P_GT3_IDS’ [-Wnested-externs]
../lib/i915/perf.c:234:3: error: initializer element is not constant
../lib/i915/perf.c:234:3: note: (near initialization for ‘devids[0]’)

> > Regards
> >
> > Chaitanya
> 
> Last thing, please add i-g-t in subject after PATCH, so it will be:
> 
> [PATCH i-g-t] describe here your patch
> 

Ack.

Regards

Chaitanya

> Regards,
> Kamil
> 
> [...cut...]

Re: [PATCH] lib: sync i915_pciids.h with kernel

[Kamil Konieczny]

Hi,

On 2023-12-18 at 10:14:34 +0000, Borah, Chaitanya Kumar wrote:
> Hello Kamil,
> 
> > -----Original Message-----
> > From: Kamil Konieczny <kamil.konieczny@linux.intel.com>
> > Sent: Thursday, December 14, 2023 8:06 PM
> > To: igt-dev@lists.freedesktop.org
> > Cc: Borah, Chaitanya Kumar <chaitanya.kumar.borah@intel.com>; Juha-Pekka
> > Heikkila <juhapekka.heikkila@gmail.com>; Garg, Nemesa
> > <nemesa.garg@intel.com>
> > Subject: Re: [PATCH] lib: sync i915_pciids.h with kernel
> > 
> > Hi,
> > 
> > On 2023-12-14 at 04:48:27 +0000, Borah, Chaitanya Kumar wrote:
> > > Hello JP,
> > >
> > > > -----Original Message-----
> > > > From: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
> > > > Sent: Wednesday, December 13, 2023 6:47 PM
> > > > To: Borah, Chaitanya Kumar <chaitanya.kumar.borah@intel.com>; igt-
> > > > dev@lists.freedesktop.org
> > > > Cc: Garg, Nemesa <nemesa.garg@intel.com>
> > > > Subject: Re: [PATCH] lib: sync i915_pciids.h with kernel
> > > >
> > > > This is not correct. This does not synchronize with kernel commit.
> > > > i915_pciids.h is supposed to be copied as is from kernel.
> > >
> > > This has crossed my mind but there are a lot of changes[1] unrelated to
> > ARL-S if we just copy the file.
> > > Therefore, it made me a bit uncomfortable. Should I go ahead anyway?
> > >
> > > At least for PVC device ids, we might have to take an exception. Or may be
> > they did not belong there in the first place.
> > >
> > 
> > You may add only ARL-S but then write in subject what you did as it is not
> > syncing, for example:
> > 
> > [PATCH] lib/i915_pciids: Add ARL-S
> > 
> > and describe why you added only that. Write also which commit (hash and
> > subject) you used (working link could also help).
> > 
> > One more thing: why not adding all without removing PVC ids?
> > 
> 
> Actually, I will go ahead and do that. I will post a patch soon.
> 
> Regards
> 
> Chaitanya

Last thing, please add i-g-t in subject after PATCH, so it will be:

[PATCH i-g-t] describe here your patch

Regards,
Kamil

[...cut...]

RE: [PATCH] lib: sync i915_pciids.h with kernel

[Borah, Chaitanya Kumar]

Hello Kamil,

> -----Original Message-----
> From: Kamil Konieczny <kamil.konieczny@linux.intel.com>
> Sent: Thursday, December 14, 2023 8:06 PM
> To: igt-dev@lists.freedesktop.org
> Cc: Borah, Chaitanya Kumar <chaitanya.kumar.borah@intel.com>; Juha-Pekka
> Heikkila <juhapekka.heikkila@gmail.com>; Garg, Nemesa
> <nemesa.garg@intel.com>
> Subject: Re: [PATCH] lib: sync i915_pciids.h with kernel
> 
> Hi,
> 
> On 2023-12-14 at 04:48:27 +0000, Borah, Chaitanya Kumar wrote:
> > Hello JP,
> >
> > > -----Original Message-----
> > > From: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
> > > Sent: Wednesday, December 13, 2023 6:47 PM
> > > To: Borah, Chaitanya Kumar <chaitanya.kumar.borah@intel.com>; igt-
> > > dev@lists.freedesktop.org
> > > Cc: Garg, Nemesa <nemesa.garg@intel.com>
> > > Subject: Re: [PATCH] lib: sync i915_pciids.h with kernel
> > >
> > > This is not correct. This does not synchronize with kernel commit.
> > > i915_pciids.h is supposed to be copied as is from kernel.
> >
> > This has crossed my mind but there are a lot of changes[1] unrelated to
> ARL-S if we just copy the file.
> > Therefore, it made me a bit uncomfortable. Should I go ahead anyway?
> >
> > At least for PVC device ids, we might have to take an exception. Or may be
> they did not belong there in the first place.
> >
> 
> You may add only ARL-S but then write in subject what you did as it is not
> syncing, for example:
> 
> [PATCH] lib/i915_pciids: Add ARL-S
> 
> and describe why you added only that. Write also which commit (hash and
> subject) you used (working link could also help).
> 
> One more thing: why not adding all without removing PVC ids?
> 

Actually, I will go ahead and do that. I will post a patch soon.

Regards

Chaitanya

> Regards,
> Kamil
> 
> > > Also don't do other
> > > changes in same patch, put intel_device_info.c changes into their own
> patch.
> > >
> >
> > Ack.
> >
> > Regards
> >
> > Chaitanya
> >
> > [1]
> > git diff
> > diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h index
> > bee58554d..fcf1849aa 100644
> > --- a/lib/i915_pciids.h
> > +++ b/lib/i915_pciids.h
> > @@ -588,6 +588,7 @@
> >         INTEL_VGA_DEVICE(0x4551, info), \
> >         INTEL_VGA_DEVICE(0x4555, info), \
> >         INTEL_VGA_DEVICE(0x4557, info), \
> > +       INTEL_VGA_DEVICE(0x4570, info), \
> >         INTEL_VGA_DEVICE(0x4571, info)
> >
> >  /* JSL */
> > @@ -641,6 +642,7 @@
> >         INTEL_VGA_DEVICE(0x4682, info), \
> >         INTEL_VGA_DEVICE(0x4688, info), \
> >         INTEL_VGA_DEVICE(0x468A, info), \
> > +       INTEL_VGA_DEVICE(0x468B, info), \
> >         INTEL_VGA_DEVICE(0x4690, info), \
> >         INTEL_VGA_DEVICE(0x4692, info), \
> >         INTEL_VGA_DEVICE(0x4693, info) @@ -683,14 +685,22 @@
> >         INTEL_VGA_DEVICE(0xA78A, info), \
> >         INTEL_VGA_DEVICE(0xA78B, info)
> >
> > +/* RPL-U */
> > +#define INTEL_RPLU_IDS(info) \
> > +       INTEL_VGA_DEVICE(0xA721, info), \
> > +       INTEL_VGA_DEVICE(0xA7A1, info), \
> > +       INTEL_VGA_DEVICE(0xA7A9, info), \
> > +       INTEL_VGA_DEVICE(0xA7AC, info), \
> > +       INTEL_VGA_DEVICE(0xA7AD, info)
> > +
> >  /* RPL-P */
> >  #define INTEL_RPLP_IDS(info) \
> > +       INTEL_RPLU_IDS(info), \
> >         INTEL_VGA_DEVICE(0xA720, info), \
> > -       INTEL_VGA_DEVICE(0xA721, info), \
> >         INTEL_VGA_DEVICE(0xA7A0, info), \
> > -       INTEL_VGA_DEVICE(0xA7A1, info), \
> >         INTEL_VGA_DEVICE(0xA7A8, info), \
> > -       INTEL_VGA_DEVICE(0xA7A9, info)
> > +       INTEL_VGA_DEVICE(0xA7AA, info), \
> > +       INTEL_VGA_DEVICE(0xA7AB, info)
> >
> >  /* DG2 */
> >  #define INTEL_DG2_G10_IDS(info) \
> > @@ -705,11 +715,14 @@
> >         INTEL_VGA_DEVICE(0x5693, info), \
> >         INTEL_VGA_DEVICE(0x5694, info), \
> >         INTEL_VGA_DEVICE(0x5695, info), \
> > -       INTEL_VGA_DEVICE(0x5698, info), \
> >         INTEL_VGA_DEVICE(0x56A5, info), \
> >         INTEL_VGA_DEVICE(0x56A6, info), \
> >         INTEL_VGA_DEVICE(0x56B0, info), \
> > -       INTEL_VGA_DEVICE(0x56B1, info)
> > +       INTEL_VGA_DEVICE(0x56B1, info), \
> > +       INTEL_VGA_DEVICE(0x56BA, info), \
> > +       INTEL_VGA_DEVICE(0x56BB, info), \
> > +       INTEL_VGA_DEVICE(0x56BC, info), \
> > +       INTEL_VGA_DEVICE(0x56BD, info)
> >
> >  #define INTEL_DG2_G12_IDS(info) \
> >         INTEL_VGA_DEVICE(0x5696, info), \ @@ -725,7 +738,8 @@
> >         INTEL_DG2_G12_IDS(info)
> >
> >  #define INTEL_ATS_M150_IDS(info) \
> > -       INTEL_VGA_DEVICE(0x56C0, info)
> > +       INTEL_VGA_DEVICE(0x56C0, info), \
> > +       INTEL_VGA_DEVICE(0x56C2, info)
> >
> >  #define INTEL_ATS_M75_IDS(info) \
> >         INTEL_VGA_DEVICE(0x56C1, info) @@ -733,34 +747,14 @@  #define
> > INTEL_ATS_M_IDS(info) \
> >         INTEL_ATS_M150_IDS(info), \
> >         INTEL_ATS_M75_IDS(info)
> > +
> >  /* MTL */
> > -#define INTEL_MTL_M_IDS(info) \
> > +#define INTEL_MTL_IDS(info) \
> >         INTEL_VGA_DEVICE(0x7D40, info), \
> > -       INTEL_VGA_DEVICE(0x7D60, info)
> > -#define INTEL_MTL_P_GT2_IDS(info) \
> > -       INTEL_VGA_DEVICE(0x7D45, info)
> > -#define INTEL_MTL_P_GT3_IDS(info) \
> > +       INTEL_VGA_DEVICE(0x7D45, info), \
> >         INTEL_VGA_DEVICE(0x7D55, info), \
> > +       INTEL_VGA_DEVICE(0x7D60, info), \
> > +       INTEL_VGA_DEVICE(0x7D67, info), \
> >         INTEL_VGA_DEVICE(0x7DD5, info) -#define INTEL_MTL_P_IDS(info)
> > \
> > -       INTEL_MTL_P_GT2_IDS(info), \
> > -       INTEL_MTL_P_GT3_IDS(info)
> > -
> > -#define INTEL_MTL_IDS(info) \
> > -       INTEL_MTL_M_IDS(info), \
> > -       INTEL_MTL_P_IDS(info)
> > -
> > -/* PVC */
> > -#define INTEL_PVC_IDS(info) \
> > -       INTEL_VGA_DEVICE(0x0BD0, info), \
> > -       INTEL_VGA_DEVICE(0x0BD5, info), \
> > -       INTEL_VGA_DEVICE(0x0BD6, info), \
> > -       INTEL_VGA_DEVICE(0x0BD7, info), \
> > -       INTEL_VGA_DEVICE(0x0BD8, info), \
> > -       INTEL_VGA_DEVICE(0x0BD9, info), \
> > -       INTEL_VGA_DEVICE(0x0BDA, info), \
> > -       INTEL_VGA_DEVICE(0x0BDB, info), \
> > -       INTEL_VGA_DEVICE(0x0BD1, info), \
> > -       INTEL_VGA_DEVICE(0x0BD2, info)
> >
> >  #endif /* _I915_PCIIDS_H */
> >
> >
> >
> > > You can see "git log lib/i915_pciids.h" for examples, sans two
> > > latest changes into the file. Two two latest changes are broken.
> > >
> > > /Juha-Pekka
> > >
> > > On 12.12.2023 11.08, Chaitanya Kumar Borah wrote:
> > > > This synchronizes with kernel commit
> > > >
> > > > 8940da9fe5f27 ("drm/i915/mtl: Adding DeviceID for Arrowlake-S
> > > > under
> > > > MTL") to bring in ARL-S PCI IDs.
> > > >
> > > > Signed-off-by: Chaitanya Kumar Borah
> > > > <chaitanya.kumar.borah@intel.com>
> > > > ---
> > > >   lib/i915_pciids.h       | 4 ++++
> > > >   lib/intel_device_info.c | 1 +
> > > >   2 files changed, 5 insertions(+)
> > > >
> > > > diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h index
> > > > bee58554d..106e42f84 100644
> > > > --- a/lib/i915_pciids.h
> > > > +++ b/lib/i915_pciids.h
> > > > @@ -750,6 +750,10 @@
> > > >   	INTEL_MTL_M_IDS(info), \
> > > >   	INTEL_MTL_P_IDS(info)
> > > >
> > > > +/* ARL-S */
> > > > +#define INTEL_ARLS_IDS(info) \
> > > > +	INTEL_VGA_DEVICE(0x7D67, info)
> > > > +
> > > >   /* PVC */
> > > >   #define INTEL_PVC_IDS(info) \
> > > >   	INTEL_VGA_DEVICE(0x0BD0, info),	\
> > > > diff --git a/lib/intel_device_info.c b/lib/intel_device_info.c
> > > > index
> > > > 34817f7b6..48036bec5 100644
> > > > --- a/lib/intel_device_info.c
> > > > +++ b/lib/intel_device_info.c
> > > > @@ -614,6 +614,7 @@ static const struct pci_id_match
> > > intel_device_match[] = {
> > > >   	INTEL_ATS_M_IDS(&intel_ats_m_info),
> > > >
> > > >   	INTEL_MTL_IDS(&intel_meteorlake_info),
> > > > +	INTEL_ARLS_IDS(&intel_meteorlake_info),
> > > >
> > > >   	INTEL_PVC_IDS(&intel_pontevecchio_info),
> > > >
> >

Re: [PATCH] lib: sync i915_pciids.h with kernel

[Kamil Konieczny]

Hi,

On 2023-12-14 at 04:48:27 +0000, Borah, Chaitanya Kumar wrote:
> Hello JP,
> 
> > -----Original Message-----
> > From: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
> > Sent: Wednesday, December 13, 2023 6:47 PM
> > To: Borah, Chaitanya Kumar <chaitanya.kumar.borah@intel.com>; igt-
> > dev@lists.freedesktop.org
> > Cc: Garg, Nemesa <nemesa.garg@intel.com>
> > Subject: Re: [PATCH] lib: sync i915_pciids.h with kernel
> > 
> > This is not correct. This does not synchronize with kernel commit.
> > i915_pciids.h is supposed to be copied as is from kernel.
> 
> This has crossed my mind but there are a lot of changes[1] unrelated to ARL-S if we just copy the file.
> Therefore, it made me a bit uncomfortable. Should I go ahead anyway?
> 
> At least for PVC device ids, we might have to take an exception. Or may be they did not belong there in the first place.
> 

You may add only ARL-S but then write in subject what you did
as it is not syncing, for example:

[PATCH] lib/i915_pciids: Add ARL-S

and describe why you added only that. Write also which commit (hash and subject)
you used (working link could also help).

One more thing: why not adding all without removing PVC ids?

Regards,
Kamil

> > Also don't do other
> > changes in same patch, put intel_device_info.c changes into their own patch.
> > 
> 
> Ack.
> 
> Regards
> 
> Chaitanya
> 
> [1]
> git diff
> diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h
> index bee58554d..fcf1849aa 100644
> --- a/lib/i915_pciids.h
> +++ b/lib/i915_pciids.h
> @@ -588,6 +588,7 @@
>         INTEL_VGA_DEVICE(0x4551, info), \
>         INTEL_VGA_DEVICE(0x4555, info), \
>         INTEL_VGA_DEVICE(0x4557, info), \
> +       INTEL_VGA_DEVICE(0x4570, info), \
>         INTEL_VGA_DEVICE(0x4571, info)
> 
>  /* JSL */
> @@ -641,6 +642,7 @@
>         INTEL_VGA_DEVICE(0x4682, info), \
>         INTEL_VGA_DEVICE(0x4688, info), \
>         INTEL_VGA_DEVICE(0x468A, info), \
> +       INTEL_VGA_DEVICE(0x468B, info), \
>         INTEL_VGA_DEVICE(0x4690, info), \
>         INTEL_VGA_DEVICE(0x4692, info), \
>         INTEL_VGA_DEVICE(0x4693, info)
> @@ -683,14 +685,22 @@
>         INTEL_VGA_DEVICE(0xA78A, info), \
>         INTEL_VGA_DEVICE(0xA78B, info)
> 
> +/* RPL-U */
> +#define INTEL_RPLU_IDS(info) \
> +       INTEL_VGA_DEVICE(0xA721, info), \
> +       INTEL_VGA_DEVICE(0xA7A1, info), \
> +       INTEL_VGA_DEVICE(0xA7A9, info), \
> +       INTEL_VGA_DEVICE(0xA7AC, info), \
> +       INTEL_VGA_DEVICE(0xA7AD, info)
> +
>  /* RPL-P */
>  #define INTEL_RPLP_IDS(info) \
> +       INTEL_RPLU_IDS(info), \
>         INTEL_VGA_DEVICE(0xA720, info), \
> -       INTEL_VGA_DEVICE(0xA721, info), \
>         INTEL_VGA_DEVICE(0xA7A0, info), \
> -       INTEL_VGA_DEVICE(0xA7A1, info), \
>         INTEL_VGA_DEVICE(0xA7A8, info), \
> -       INTEL_VGA_DEVICE(0xA7A9, info)
> +       INTEL_VGA_DEVICE(0xA7AA, info), \
> +       INTEL_VGA_DEVICE(0xA7AB, info)
> 
>  /* DG2 */
>  #define INTEL_DG2_G10_IDS(info) \
> @@ -705,11 +715,14 @@
>         INTEL_VGA_DEVICE(0x5693, info), \
>         INTEL_VGA_DEVICE(0x5694, info), \
>         INTEL_VGA_DEVICE(0x5695, info), \
> -       INTEL_VGA_DEVICE(0x5698, info), \
>         INTEL_VGA_DEVICE(0x56A5, info), \
>         INTEL_VGA_DEVICE(0x56A6, info), \
>         INTEL_VGA_DEVICE(0x56B0, info), \
> -       INTEL_VGA_DEVICE(0x56B1, info)
> +       INTEL_VGA_DEVICE(0x56B1, info), \
> +       INTEL_VGA_DEVICE(0x56BA, info), \
> +       INTEL_VGA_DEVICE(0x56BB, info), \
> +       INTEL_VGA_DEVICE(0x56BC, info), \
> +       INTEL_VGA_DEVICE(0x56BD, info)
> 
>  #define INTEL_DG2_G12_IDS(info) \
>         INTEL_VGA_DEVICE(0x5696, info), \
> @@ -725,7 +738,8 @@
>         INTEL_DG2_G12_IDS(info)
> 
>  #define INTEL_ATS_M150_IDS(info) \
> -       INTEL_VGA_DEVICE(0x56C0, info)
> +       INTEL_VGA_DEVICE(0x56C0, info), \
> +       INTEL_VGA_DEVICE(0x56C2, info)
> 
>  #define INTEL_ATS_M75_IDS(info) \
>         INTEL_VGA_DEVICE(0x56C1, info)
> @@ -733,34 +747,14 @@
>  #define INTEL_ATS_M_IDS(info) \
>         INTEL_ATS_M150_IDS(info), \
>         INTEL_ATS_M75_IDS(info)
> +
>  /* MTL */
> -#define INTEL_MTL_M_IDS(info) \
> +#define INTEL_MTL_IDS(info) \
>         INTEL_VGA_DEVICE(0x7D40, info), \
> -       INTEL_VGA_DEVICE(0x7D60, info)
> -#define INTEL_MTL_P_GT2_IDS(info) \
> -       INTEL_VGA_DEVICE(0x7D45, info)
> -#define INTEL_MTL_P_GT3_IDS(info) \
> +       INTEL_VGA_DEVICE(0x7D45, info), \
>         INTEL_VGA_DEVICE(0x7D55, info), \
> +       INTEL_VGA_DEVICE(0x7D60, info), \
> +       INTEL_VGA_DEVICE(0x7D67, info), \
>         INTEL_VGA_DEVICE(0x7DD5, info)
> -#define INTEL_MTL_P_IDS(info) \
> -       INTEL_MTL_P_GT2_IDS(info), \
> -       INTEL_MTL_P_GT3_IDS(info)
> -
> -#define INTEL_MTL_IDS(info) \
> -       INTEL_MTL_M_IDS(info), \
> -       INTEL_MTL_P_IDS(info)
> -
> -/* PVC */
> -#define INTEL_PVC_IDS(info) \
> -       INTEL_VGA_DEVICE(0x0BD0, info), \
> -       INTEL_VGA_DEVICE(0x0BD5, info), \
> -       INTEL_VGA_DEVICE(0x0BD6, info), \
> -       INTEL_VGA_DEVICE(0x0BD7, info), \
> -       INTEL_VGA_DEVICE(0x0BD8, info), \
> -       INTEL_VGA_DEVICE(0x0BD9, info), \
> -       INTEL_VGA_DEVICE(0x0BDA, info), \
> -       INTEL_VGA_DEVICE(0x0BDB, info), \
> -       INTEL_VGA_DEVICE(0x0BD1, info), \
> -       INTEL_VGA_DEVICE(0x0BD2, info)
> 
>  #endif /* _I915_PCIIDS_H */
> 
> 
> 
> > You can see "git log lib/i915_pciids.h" for examples, sans two latest changes
> > into the file. Two two latest changes are broken.
> > 
> > /Juha-Pekka
> > 
> > On 12.12.2023 11.08, Chaitanya Kumar Borah wrote:
> > > This synchronizes with kernel commit
> > >
> > > 8940da9fe5f27 ("drm/i915/mtl: Adding DeviceID for Arrowlake-S under
> > > MTL") to bring in ARL-S PCI IDs.
> > >
> > > Signed-off-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
> > > ---
> > >   lib/i915_pciids.h       | 4 ++++
> > >   lib/intel_device_info.c | 1 +
> > >   2 files changed, 5 insertions(+)
> > >
> > > diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h index
> > > bee58554d..106e42f84 100644
> > > --- a/lib/i915_pciids.h
> > > +++ b/lib/i915_pciids.h
> > > @@ -750,6 +750,10 @@
> > >   	INTEL_MTL_M_IDS(info), \
> > >   	INTEL_MTL_P_IDS(info)
> > >
> > > +/* ARL-S */
> > > +#define INTEL_ARLS_IDS(info) \
> > > +	INTEL_VGA_DEVICE(0x7D67, info)
> > > +
> > >   /* PVC */
> > >   #define INTEL_PVC_IDS(info) \
> > >   	INTEL_VGA_DEVICE(0x0BD0, info),	\
> > > diff --git a/lib/intel_device_info.c b/lib/intel_device_info.c index
> > > 34817f7b6..48036bec5 100644
> > > --- a/lib/intel_device_info.c
> > > +++ b/lib/intel_device_info.c
> > > @@ -614,6 +614,7 @@ static const struct pci_id_match
> > intel_device_match[] = {
> > >   	INTEL_ATS_M_IDS(&intel_ats_m_info),
> > >
> > >   	INTEL_MTL_IDS(&intel_meteorlake_info),
> > > +	INTEL_ARLS_IDS(&intel_meteorlake_info),
> > >
> > >   	INTEL_PVC_IDS(&intel_pontevecchio_info),
> > >
> 

RE: [PATCH] lib: sync i915_pciids.h with kernel

[Borah, Chaitanya Kumar]

Hello JP,

> -----Original Message-----
> From: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
> Sent: Wednesday, December 13, 2023 6:47 PM
> To: Borah, Chaitanya Kumar <chaitanya.kumar.borah@intel.com>; igt-
> dev@lists.freedesktop.org
> Cc: Garg, Nemesa <nemesa.garg@intel.com>
> Subject: Re: [PATCH] lib: sync i915_pciids.h with kernel
> 
> This is not correct. This does not synchronize with kernel commit.
> i915_pciids.h is supposed to be copied as is from kernel.

This has crossed my mind but there are a lot of changes[1] unrelated to ARL-S if we just copy the file.
Therefore, it made me a bit uncomfortable. Should I go ahead anyway?

At least for PVC device ids, we might have to take an exception. Or may be they did not belong there in the first place.

> Also don't do other
> changes in same patch, put intel_device_info.c changes into their own patch.
> 

Ack.

Regards

Chaitanya

[1]
git diff
diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h
index bee58554d..fcf1849aa 100644
--- a/lib/i915_pciids.h
+++ b/lib/i915_pciids.h
@@ -588,6 +588,7 @@
        INTEL_VGA_DEVICE(0x4551, info), \
        INTEL_VGA_DEVICE(0x4555, info), \
        INTEL_VGA_DEVICE(0x4557, info), \
+       INTEL_VGA_DEVICE(0x4570, info), \
        INTEL_VGA_DEVICE(0x4571, info)

 /* JSL */
@@ -641,6 +642,7 @@
        INTEL_VGA_DEVICE(0x4682, info), \
        INTEL_VGA_DEVICE(0x4688, info), \
        INTEL_VGA_DEVICE(0x468A, info), \
+       INTEL_VGA_DEVICE(0x468B, info), \
        INTEL_VGA_DEVICE(0x4690, info), \
        INTEL_VGA_DEVICE(0x4692, info), \
        INTEL_VGA_DEVICE(0x4693, info)
@@ -683,14 +685,22 @@
        INTEL_VGA_DEVICE(0xA78A, info), \
        INTEL_VGA_DEVICE(0xA78B, info)

+/* RPL-U */
+#define INTEL_RPLU_IDS(info) \
+       INTEL_VGA_DEVICE(0xA721, info), \
+       INTEL_VGA_DEVICE(0xA7A1, info), \
+       INTEL_VGA_DEVICE(0xA7A9, info), \
+       INTEL_VGA_DEVICE(0xA7AC, info), \
+       INTEL_VGA_DEVICE(0xA7AD, info)
+
 /* RPL-P */
 #define INTEL_RPLP_IDS(info) \
+       INTEL_RPLU_IDS(info), \
        INTEL_VGA_DEVICE(0xA720, info), \
-       INTEL_VGA_DEVICE(0xA721, info), \
        INTEL_VGA_DEVICE(0xA7A0, info), \
-       INTEL_VGA_DEVICE(0xA7A1, info), \
        INTEL_VGA_DEVICE(0xA7A8, info), \
-       INTEL_VGA_DEVICE(0xA7A9, info)
+       INTEL_VGA_DEVICE(0xA7AA, info), \
+       INTEL_VGA_DEVICE(0xA7AB, info)

 /* DG2 */
 #define INTEL_DG2_G10_IDS(info) \
@@ -705,11 +715,14 @@
        INTEL_VGA_DEVICE(0x5693, info), \
        INTEL_VGA_DEVICE(0x5694, info), \
        INTEL_VGA_DEVICE(0x5695, info), \
-       INTEL_VGA_DEVICE(0x5698, info), \
        INTEL_VGA_DEVICE(0x56A5, info), \
        INTEL_VGA_DEVICE(0x56A6, info), \
        INTEL_VGA_DEVICE(0x56B0, info), \
-       INTEL_VGA_DEVICE(0x56B1, info)
+       INTEL_VGA_DEVICE(0x56B1, info), \
+       INTEL_VGA_DEVICE(0x56BA, info), \
+       INTEL_VGA_DEVICE(0x56BB, info), \
+       INTEL_VGA_DEVICE(0x56BC, info), \
+       INTEL_VGA_DEVICE(0x56BD, info)

 #define INTEL_DG2_G12_IDS(info) \
        INTEL_VGA_DEVICE(0x5696, info), \
@@ -725,7 +738,8 @@
        INTEL_DG2_G12_IDS(info)

 #define INTEL_ATS_M150_IDS(info) \
-       INTEL_VGA_DEVICE(0x56C0, info)
+       INTEL_VGA_DEVICE(0x56C0, info), \
+       INTEL_VGA_DEVICE(0x56C2, info)

 #define INTEL_ATS_M75_IDS(info) \
        INTEL_VGA_DEVICE(0x56C1, info)
@@ -733,34 +747,14 @@
 #define INTEL_ATS_M_IDS(info) \
        INTEL_ATS_M150_IDS(info), \
        INTEL_ATS_M75_IDS(info)
+
 /* MTL */
-#define INTEL_MTL_M_IDS(info) \
+#define INTEL_MTL_IDS(info) \
        INTEL_VGA_DEVICE(0x7D40, info), \
-       INTEL_VGA_DEVICE(0x7D60, info)
-#define INTEL_MTL_P_GT2_IDS(info) \
-       INTEL_VGA_DEVICE(0x7D45, info)
-#define INTEL_MTL_P_GT3_IDS(info) \
+       INTEL_VGA_DEVICE(0x7D45, info), \
        INTEL_VGA_DEVICE(0x7D55, info), \
+       INTEL_VGA_DEVICE(0x7D60, info), \
+       INTEL_VGA_DEVICE(0x7D67, info), \
        INTEL_VGA_DEVICE(0x7DD5, info)
-#define INTEL_MTL_P_IDS(info) \
-       INTEL_MTL_P_GT2_IDS(info), \
-       INTEL_MTL_P_GT3_IDS(info)
-
-#define INTEL_MTL_IDS(info) \
-       INTEL_MTL_M_IDS(info), \
-       INTEL_MTL_P_IDS(info)
-
-/* PVC */
-#define INTEL_PVC_IDS(info) \
-       INTEL_VGA_DEVICE(0x0BD0, info), \
-       INTEL_VGA_DEVICE(0x0BD5, info), \
-       INTEL_VGA_DEVICE(0x0BD6, info), \
-       INTEL_VGA_DEVICE(0x0BD7, info), \
-       INTEL_VGA_DEVICE(0x0BD8, info), \
-       INTEL_VGA_DEVICE(0x0BD9, info), \
-       INTEL_VGA_DEVICE(0x0BDA, info), \
-       INTEL_VGA_DEVICE(0x0BDB, info), \
-       INTEL_VGA_DEVICE(0x0BD1, info), \
-       INTEL_VGA_DEVICE(0x0BD2, info)

 #endif /* _I915_PCIIDS_H */



> You can see "git log lib/i915_pciids.h" for examples, sans two latest changes
> into the file. Two two latest changes are broken.
> 
> /Juha-Pekka
> 
> On 12.12.2023 11.08, Chaitanya Kumar Borah wrote:
> > This synchronizes with kernel commit
> >
> > 8940da9fe5f27 ("drm/i915/mtl: Adding DeviceID for Arrowlake-S under
> > MTL") to bring in ARL-S PCI IDs.
> >
> > Signed-off-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
> > ---
> >   lib/i915_pciids.h       | 4 ++++
> >   lib/intel_device_info.c | 1 +
> >   2 files changed, 5 insertions(+)
> >
> > diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h index
> > bee58554d..106e42f84 100644
> > --- a/lib/i915_pciids.h
> > +++ b/lib/i915_pciids.h
> > @@ -750,6 +750,10 @@
> >   	INTEL_MTL_M_IDS(info), \
> >   	INTEL_MTL_P_IDS(info)
> >
> > +/* ARL-S */
> > +#define INTEL_ARLS_IDS(info) \
> > +	INTEL_VGA_DEVICE(0x7D67, info)
> > +
> >   /* PVC */
> >   #define INTEL_PVC_IDS(info) \
> >   	INTEL_VGA_DEVICE(0x0BD0, info),	\
> > diff --git a/lib/intel_device_info.c b/lib/intel_device_info.c index
> > 34817f7b6..48036bec5 100644
> > --- a/lib/intel_device_info.c
> > +++ b/lib/intel_device_info.c
> > @@ -614,6 +614,7 @@ static const struct pci_id_match
> intel_device_match[] = {
> >   	INTEL_ATS_M_IDS(&intel_ats_m_info),
> >
> >   	INTEL_MTL_IDS(&intel_meteorlake_info),
> > +	INTEL_ARLS_IDS(&intel_meteorlake_info),
> >
> >   	INTEL_PVC_IDS(&intel_pontevecchio_info),
> >

Re: [PATCH] lib: sync i915_pciids.h with kernel

[Juha-Pekka Heikkila]

This is not correct. This does not synchronize with kernel commit. 
i915_pciids.h is supposed to be copied as is from kernel. Also don't do 
other changes in same patch, put intel_device_info.c changes into their 
own patch.

You can see "git log lib/i915_pciids.h" for examples, sans two latest 
changes into the file. Two two latest changes are broken.

/Juha-Pekka

On 12.12.2023 11.08, Chaitanya Kumar Borah wrote:
> This synchronizes with kernel commit
> 
> 8940da9fe5f27 ("drm/i915/mtl: Adding DeviceID for Arrowlake-S under MTL")
> to bring in ARL-S PCI IDs.
> 
> Signed-off-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
> ---
>   lib/i915_pciids.h       | 4 ++++
>   lib/intel_device_info.c | 1 +
>   2 files changed, 5 insertions(+)
> 
> diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h
> index bee58554d..106e42f84 100644
> --- a/lib/i915_pciids.h
> +++ b/lib/i915_pciids.h
> @@ -750,6 +750,10 @@
>   	INTEL_MTL_M_IDS(info), \
>   	INTEL_MTL_P_IDS(info)
>   
> +/* ARL-S */
> +#define INTEL_ARLS_IDS(info) \
> +	INTEL_VGA_DEVICE(0x7D67, info)
> +
>   /* PVC */
>   #define INTEL_PVC_IDS(info) \
>   	INTEL_VGA_DEVICE(0x0BD0, info),	\
> diff --git a/lib/intel_device_info.c b/lib/intel_device_info.c
> index 34817f7b6..48036bec5 100644
> --- a/lib/intel_device_info.c
> +++ b/lib/intel_device_info.c
> @@ -614,6 +614,7 @@ static const struct pci_id_match intel_device_match[] = {
>   	INTEL_ATS_M_IDS(&intel_ats_m_info),
>   
>   	INTEL_MTL_IDS(&intel_meteorlake_info),
> +	INTEL_ARLS_IDS(&intel_meteorlake_info),
>   
>   	INTEL_PVC_IDS(&intel_pontevecchio_info),
>   

[PATCH] lib: sync i915_pciids.h with kernel

[Chaitanya Kumar Borah]

This synchronizes with kernel commit

8940da9fe5f27 ("drm/i915/mtl: Adding DeviceID for Arrowlake-S under MTL")
to bring in ARL-S PCI IDs.

Signed-off-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
---
 lib/i915_pciids.h       | 4 ++++
 lib/intel_device_info.c | 1 +
 2 files changed, 5 insertions(+)

diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h
index bee58554d..106e42f84 100644
--- a/lib/i915_pciids.h
+++ b/lib/i915_pciids.h
@@ -750,6 +750,10 @@
 	INTEL_MTL_M_IDS(info), \
 	INTEL_MTL_P_IDS(info)
 
+/* ARL-S */
+#define INTEL_ARLS_IDS(info) \
+	INTEL_VGA_DEVICE(0x7D67, info)
+
 /* PVC */
 #define INTEL_PVC_IDS(info) \
 	INTEL_VGA_DEVICE(0x0BD0, info),	\
diff --git a/lib/intel_device_info.c b/lib/intel_device_info.c
index 34817f7b6..48036bec5 100644
--- a/lib/intel_device_info.c
+++ b/lib/intel_device_info.c
@@ -614,6 +614,7 @@ static const struct pci_id_match intel_device_match[] = {
 	INTEL_ATS_M_IDS(&intel_ats_m_info),
 
 	INTEL_MTL_IDS(&intel_meteorlake_info),
+	INTEL_ARLS_IDS(&intel_meteorlake_info),
 
 	INTEL_PVC_IDS(&intel_pontevecchio_info),
 
-- 
2.25.1