* [PATCH] lib: sync i915_pciids.h with kernel
@ 2023-12-12 9:08 Chaitanya Kumar Borah
2023-12-12 10:24 ` ✗ CI.xeBAT: failure for lib: sync i915_pciids.h with kernel (rev14) Patchwork
` (2 more replies)
0 siblings, 3 replies; 16+ messages in thread
From: Chaitanya Kumar Borah @ 2023-12-12 9:08 UTC (permalink / raw)
To: igt-dev; +Cc: nemesa.garg
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
^ permalink raw reply related [flat|nested] 16+ messages in thread* ✗ CI.xeBAT: failure for lib: sync i915_pciids.h with kernel (rev14) 2023-12-12 9:08 [PATCH] lib: sync i915_pciids.h with kernel Chaitanya Kumar Borah @ 2023-12-12 10:24 ` Patchwork 2023-12-13 13:17 ` [PATCH] lib: sync i915_pciids.h with kernel Juha-Pekka Heikkila 2023-12-14 5:03 ` ✗ Fi.CI.BUILD: failure for lib: sync i915_pciids.h with kernel (rev15) Patchwork 2 siblings, 0 replies; 16+ messages in thread From: Patchwork @ 2023-12-12 10:24 UTC (permalink / raw) To: Rodrigo Vivi; +Cc: igt-dev [-- Attachment #1: Type: text/plain, Size: 14899 bytes --] == Series Details == Series: lib: sync i915_pciids.h with kernel (rev14) URL : https://patchwork.freedesktop.org/series/50957/ State : failure == Summary == CI Bug Log - changes from XEIGT_7636_BAT -> XEIGTPW_10400_BAT ==================================================== Summary ------- **FAILURE** Serious unknown changes coming with XEIGTPW_10400_BAT absolutely need to be verified manually. If you think the reported changes have nothing to do with the changes introduced in XEIGTPW_10400_BAT, please notify your bug team (I915-ci-infra@lists.freedesktop.org) to allow them to document this new failure mode, which will reduce false positives in CI. Participating hosts (1 -> 4) ------------------------------ Additional (3): bat-pvc-2 bat-dg2-oem2 bat-atsm-2 Possible new issues ------------------- Here are the unknown changes that may have been introduced in XEIGTPW_10400_BAT: ### IGT changes ### #### Possible regressions #### * igt@kms_cursor_legacy@basic-flip-after-cursor-atomic: - bat-adlp-7: [PASS][1] -> [FAIL][2] [1]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7636/bat-adlp-7/igt@kms_cursor_legacy@basic-flip-after-cursor-atomic.html [2]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10400/bat-adlp-7/igt@kms_cursor_legacy@basic-flip-after-cursor-atomic.html Known issues ------------ Here are the changes found in XEIGTPW_10400_BAT that come from known issues: ### IGT changes ### #### Issues hit #### * igt@kms_addfb_basic@addfb25-x-tiled-legacy: - bat-pvc-2: NOTRUN -> [SKIP][3] ([i915#6077]) +30 other tests skip [3]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10400/bat-pvc-2/igt@kms_addfb_basic@addfb25-x-tiled-legacy.html * igt@kms_addfb_basic@addfb25-y-tiled-small-legacy: - bat-dg2-oem2: NOTRUN -> [SKIP][4] ([Intel XE#623]) [4]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10400/bat-dg2-oem2/igt@kms_addfb_basic@addfb25-y-tiled-small-legacy.html * igt@kms_addfb_basic@invalid-set-prop-any: - bat-atsm-2: NOTRUN -> [SKIP][5] ([i915#6077]) +30 other tests skip [5]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10400/bat-atsm-2/igt@kms_addfb_basic@invalid-set-prop-any.html * igt@kms_cursor_legacy@basic-flip-after-cursor-atomic: - bat-pvc-2: NOTRUN -> [SKIP][6] ([Intel XE#1024] / [Intel XE#782]) +5 other tests skip [6]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10400/bat-pvc-2/igt@kms_cursor_legacy@basic-flip-after-cursor-atomic.html * igt@kms_cursor_legacy@basic-flip-before-cursor-legacy: - bat-atsm-2: NOTRUN -> [SKIP][7] ([Intel XE#1024] / [Intel XE#782]) +5 other tests skip [7]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10400/bat-atsm-2/igt@kms_cursor_legacy@basic-flip-before-cursor-legacy.html * igt@kms_dsc@dsc-basic: - bat-atsm-2: NOTRUN -> [SKIP][8] ([Intel XE#1024] / [Intel XE#784]) [8]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10400/bat-atsm-2/igt@kms_dsc@dsc-basic.html - bat-pvc-2: NOTRUN -> [SKIP][9] ([Intel XE#1024] / [Intel XE#784]) [9]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10400/bat-pvc-2/igt@kms_dsc@dsc-basic.html - bat-dg2-oem2: NOTRUN -> [SKIP][10] ([Intel XE#423]) [10]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10400/bat-dg2-oem2/igt@kms_dsc@dsc-basic.html * igt@kms_flip@basic-flip-vs-dpms: - bat-pvc-2: NOTRUN -> [SKIP][11] ([Intel XE#1024] / [Intel XE#947]) +3 other tests skip [11]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10400/bat-pvc-2/igt@kms_flip@basic-flip-vs-dpms.html * igt@kms_flip@basic-flip-vs-modeset: - bat-atsm-2: NOTRUN -> [SKIP][12] ([Intel XE#1024] / [Intel XE#947]) +3 other tests skip [12]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10400/bat-atsm-2/igt@kms_flip@basic-flip-vs-modeset.html * igt@kms_force_connector_basic@force-connector-state: - bat-pvc-2: NOTRUN -> [SKIP][13] ([Intel XE#540]) +3 other tests skip [13]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10400/bat-pvc-2/igt@kms_force_connector_basic@force-connector-state.html - bat-atsm-2: NOTRUN -> [SKIP][14] ([Intel XE#540]) +3 other tests skip [14]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10400/bat-atsm-2/igt@kms_force_connector_basic@force-connector-state.html * igt@kms_force_connector_basic@prune-stale-modes: - bat-dg2-oem2: NOTRUN -> [SKIP][15] ([i915#5274]) [15]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10400/bat-dg2-oem2/igt@kms_force_connector_basic@prune-stale-modes.html * igt@kms_frontbuffer_tracking@basic: - bat-pvc-2: NOTRUN -> [SKIP][16] ([Intel XE#1024] / [Intel XE#783]) [16]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10400/bat-pvc-2/igt@kms_frontbuffer_tracking@basic.html - bat-dg2-oem2: NOTRUN -> [FAIL][17] ([Intel XE#608]) [17]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10400/bat-dg2-oem2/igt@kms_frontbuffer_tracking@basic.html - bat-atsm-2: NOTRUN -> [SKIP][18] ([Intel XE#1024] / [Intel XE#783]) [18]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10400/bat-atsm-2/igt@kms_frontbuffer_tracking@basic.html * igt@kms_pipe_crc_basic@compare-crc-sanitycheck-nv12: - bat-dg2-oem2: NOTRUN -> [FAIL][19] ([Intel XE#400] / [Intel XE#616]) +2 other tests fail [19]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10400/bat-dg2-oem2/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-nv12.html * igt@kms_pipe_crc_basic@compare-crc-sanitycheck-xr24: - bat-atsm-2: NOTRUN -> [SKIP][20] ([i915#1836]) +6 other tests skip [20]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10400/bat-atsm-2/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-xr24.html * igt@kms_pipe_crc_basic@nonblocking-crc-frame-sequence: - bat-pvc-2: NOTRUN -> [SKIP][21] ([Intel XE#829]) +6 other tests skip [21]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10400/bat-pvc-2/igt@kms_pipe_crc_basic@nonblocking-crc-frame-sequence.html * igt@kms_prop_blob@basic: - bat-pvc-2: NOTRUN -> [SKIP][22] ([Intel XE#780]) [22]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10400/bat-pvc-2/igt@kms_prop_blob@basic.html - bat-atsm-2: NOTRUN -> [SKIP][23] ([Intel XE#780]) [23]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10400/bat-atsm-2/igt@kms_prop_blob@basic.html * igt@xe_compute@compute-square: - bat-atsm-2: NOTRUN -> [SKIP][24] ([Intel XE#672]) [24]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10400/bat-atsm-2/igt@xe_compute@compute-square.html - bat-dg2-oem2: NOTRUN -> [SKIP][25] ([Intel XE#672]) [25]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10400/bat-dg2-oem2/igt@xe_compute@compute-square.html * igt@xe_create@create-execqueues-noleak: - bat-atsm-2: NOTRUN -> [FAIL][26] ([Intel XE#524]) [26]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10400/bat-atsm-2/igt@xe_create@create-execqueues-noleak.html * igt@xe_evict@evict-beng-small-external: - bat-pvc-2: NOTRUN -> [FAIL][27] ([Intel XE#1000]) +3 other tests fail [27]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10400/bat-pvc-2/igt@xe_evict@evict-beng-small-external.html * igt@xe_evict@evict-small-cm: - bat-pvc-2: NOTRUN -> [DMESG-FAIL][28] ([Intel XE#482]) +3 other tests dmesg-fail [28]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10400/bat-pvc-2/igt@xe_evict@evict-small-cm.html * igt@xe_evict_ccs@evict-overcommit-parallel-nofree-samefd: - bat-pvc-2: NOTRUN -> [INCOMPLETE][29] ([Intel XE#392]) [29]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10400/bat-pvc-2/igt@xe_evict_ccs@evict-overcommit-parallel-nofree-samefd.html * igt@xe_exec_fault_mode@many-basic: - bat-dg2-oem2: NOTRUN -> [SKIP][30] ([Intel XE#288]) +32 other tests skip [30]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10400/bat-dg2-oem2/igt@xe_exec_fault_mode@many-basic.html * igt@xe_exec_fault_mode@twice-userptr-invalidate-imm: - bat-atsm-2: NOTRUN -> [SKIP][31] ([Intel XE#288]) +32 other tests skip [31]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10400/bat-atsm-2/igt@xe_exec_fault_mode@twice-userptr-invalidate-imm.html * igt@xe_huc_copy@huc_copy: - bat-pvc-2: NOTRUN -> [SKIP][32] ([Intel XE#255]) [32]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10400/bat-pvc-2/igt@xe_huc_copy@huc_copy.html - bat-dg2-oem2: NOTRUN -> [SKIP][33] ([Intel XE#255]) [33]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10400/bat-dg2-oem2/igt@xe_huc_copy@huc_copy.html - bat-atsm-2: NOTRUN -> [SKIP][34] ([Intel XE#255]) [34]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10400/bat-atsm-2/igt@xe_huc_copy@huc_copy.html * igt@xe_intel_bb@render: - bat-pvc-2: NOTRUN -> [SKIP][35] ([Intel XE#532]) [35]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10400/bat-pvc-2/igt@xe_intel_bb@render.html * igt@xe_module_load@load: - bat-pvc-2: NOTRUN -> [SKIP][36] ([Intel XE#378]) [36]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10400/bat-pvc-2/igt@xe_module_load@load.html * igt@xe_pat@pat-index-xe2: - bat-pvc-2: NOTRUN -> [SKIP][37] ([Intel XE#977]) +1 other test skip [37]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10400/bat-pvc-2/igt@xe_pat@pat-index-xe2.html - bat-atsm-2: NOTRUN -> [SKIP][38] ([Intel XE#977]) [38]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10400/bat-atsm-2/igt@xe_pat@pat-index-xe2.html - bat-dg2-oem2: NOTRUN -> [SKIP][39] ([Intel XE#977]) [39]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10400/bat-dg2-oem2/igt@xe_pat@pat-index-xe2.html * igt@xe_pat@pat-index-xehpc: - bat-dg2-oem2: NOTRUN -> [SKIP][40] ([Intel XE#979]) +1 other test skip [40]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10400/bat-dg2-oem2/igt@xe_pat@pat-index-xehpc.html * igt@xe_pat@pat-index-xelpg: - bat-atsm-2: NOTRUN -> [SKIP][41] ([Intel XE#979]) +1 other test skip [41]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10400/bat-atsm-2/igt@xe_pat@pat-index-xelpg.html - bat-pvc-2: NOTRUN -> [SKIP][42] ([Intel XE#979]) [42]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10400/bat-pvc-2/igt@xe_pat@pat-index-xelpg.html * igt@xe_pm_residency@gt-c6-on-idle: - bat-pvc-2: NOTRUN -> [SKIP][43] ([Intel XE#531]) [43]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10400/bat-pvc-2/igt@xe_pm_residency@gt-c6-on-idle.html * igt@xe_prime_self_import@basic-with_one_bo: - bat-atsm-2: NOTRUN -> [FAIL][44] ([Intel XE#999]) [44]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10400/bat-atsm-2/igt@xe_prime_self_import@basic-with_one_bo.html - bat-pvc-2: NOTRUN -> [FAIL][45] ([Intel XE#999]) +1 other test fail [45]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10400/bat-pvc-2/igt@xe_prime_self_import@basic-with_one_bo.html #### Possible fixes #### * igt@kms_flip@basic-flip-vs-wf_vblank@a-edp1: - bat-adlp-7: [FAIL][46] ([Intel XE#480]) -> [PASS][47] +1 other test pass [46]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7636/bat-adlp-7/igt@kms_flip@basic-flip-vs-wf_vblank@a-edp1.html [47]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10400/bat-adlp-7/igt@kms_flip@basic-flip-vs-wf_vblank@a-edp1.html #### Warnings #### * igt@kms_frontbuffer_tracking@basic: - bat-adlp-7: [DMESG-WARN][48] ([Intel XE#282] / [i915#2017]) -> [DMESG-FAIL][49] ([Intel XE#282] / [i915#2017]) [48]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7636/bat-adlp-7/igt@kms_frontbuffer_tracking@basic.html [49]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10400/bat-adlp-7/igt@kms_frontbuffer_tracking@basic.html {name}: This element is suppressed. This means it is ignored when computing the status of the difference (SUCCESS, WARNING, or FAILURE). [Intel XE#1000]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1000 [Intel XE#1021]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1021 [Intel XE#1024]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1024 [Intel XE#255]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/255 [Intel XE#282]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/282 [Intel XE#288]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/288 [Intel XE#378]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/378 [Intel XE#392]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/392 [Intel XE#400]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/400 [Intel XE#423]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/423 [Intel XE#480]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/480 [Intel XE#482]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/482 [Intel XE#524]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/524 [Intel XE#531]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/531 [Intel XE#532]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/532 [Intel XE#540]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/540 [Intel XE#608]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/608 [Intel XE#616]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/616 [Intel XE#623]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/623 [Intel XE#672]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/672 [Intel XE#780]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/780 [Intel XE#782]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/782 [Intel XE#783]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/783 [Intel XE#784]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/784 [Intel XE#829]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/829 [Intel XE#929]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/929 [Intel XE#947]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/947 [Intel XE#976]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/976 [Intel XE#977]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/977 [Intel XE#979]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/979 [Intel XE#999]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/999 [i915#1836]: https://gitlab.freedesktop.org/drm/intel/issues/1836 [i915#2017]: https://gitlab.freedesktop.org/drm/intel/issues/2017 [i915#5274]: https://gitlab.freedesktop.org/drm/intel/issues/5274 [i915#6077]: https://gitlab.freedesktop.org/drm/intel/issues/6077 Build changes ------------- * IGT: IGT_7636 -> IGTPW_10400 IGTPW_10400: 10400 IGT_7636: 7636 xe-570-0c30a1b58ce6096e5d6a6c9ba32961c345fab7c8: 0c30a1b58ce6096e5d6a6c9ba32961c345fab7c8 == Logs == For more details see: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10400/index.html [-- Attachment #2: Type: text/html, Size: 17987 bytes --] ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] lib: sync i915_pciids.h with kernel 2023-12-12 9:08 [PATCH] lib: sync i915_pciids.h with kernel Chaitanya Kumar Borah 2023-12-12 10:24 ` ✗ CI.xeBAT: failure for lib: sync i915_pciids.h with kernel (rev14) Patchwork @ 2023-12-13 13:17 ` Juha-Pekka Heikkila 2023-12-14 4:48 ` Borah, Chaitanya Kumar 2023-12-14 5:03 ` ✗ Fi.CI.BUILD: failure for lib: sync i915_pciids.h with kernel (rev15) Patchwork 2 siblings, 1 reply; 16+ messages in thread From: Juha-Pekka Heikkila @ 2023-12-13 13:17 UTC (permalink / raw) To: Chaitanya Kumar Borah, igt-dev; +Cc: nemesa.garg 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), > ^ permalink raw reply [flat|nested] 16+ messages in thread
* RE: [PATCH] lib: sync i915_pciids.h with kernel 2023-12-13 13:17 ` [PATCH] lib: sync i915_pciids.h with kernel Juha-Pekka Heikkila @ 2023-12-14 4:48 ` Borah, Chaitanya Kumar 2023-12-14 14:36 ` Kamil Konieczny 0 siblings, 1 reply; 16+ messages in thread From: Borah, Chaitanya Kumar @ 2023-12-14 4:48 UTC (permalink / raw) To: juhapekka.heikkila, igt-dev; +Cc: Garg, Nemesa 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), > > ^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH] lib: sync i915_pciids.h with kernel 2023-12-14 4:48 ` Borah, Chaitanya Kumar @ 2023-12-14 14:36 ` Kamil Konieczny 2023-12-18 10:14 ` Borah, Chaitanya Kumar 0 siblings, 1 reply; 16+ messages in thread From: Kamil Konieczny @ 2023-12-14 14:36 UTC (permalink / raw) To: igt-dev; +Cc: Nemesa Garg 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), > > > > ^ permalink raw reply [flat|nested] 16+ messages in thread
* RE: [PATCH] lib: sync i915_pciids.h with kernel 2023-12-14 14:36 ` Kamil Konieczny @ 2023-12-18 10:14 ` Borah, Chaitanya Kumar 2023-12-18 16:19 ` Kamil Konieczny 0 siblings, 1 reply; 16+ messages in thread From: Borah, Chaitanya Kumar @ 2023-12-18 10:14 UTC (permalink / raw) To: Kamil Konieczny, igt-dev; +Cc: Garg, Nemesa 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), > > > > > > ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] lib: sync i915_pciids.h with kernel 2023-12-18 10:14 ` Borah, Chaitanya Kumar @ 2023-12-18 16:19 ` Kamil Konieczny 2023-12-19 5:43 ` Borah, Chaitanya Kumar 0 siblings, 1 reply; 16+ messages in thread From: Kamil Konieczny @ 2023-12-18 16:19 UTC (permalink / raw) To: igt-dev; +Cc: Garg, Nemesa 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...] ^ permalink raw reply [flat|nested] 16+ messages in thread
* RE: [PATCH] lib: sync i915_pciids.h with kernel 2023-12-18 16:19 ` Kamil Konieczny @ 2023-12-19 5:43 ` Borah, Chaitanya Kumar 2023-12-19 7:00 ` Kamil Konieczny 0 siblings, 1 reply; 16+ messages in thread From: Borah, Chaitanya Kumar @ 2023-12-19 5:43 UTC (permalink / raw) To: Kamil Konieczny, igt-dev; +Cc: Garg, Nemesa 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...] ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] lib: sync i915_pciids.h with kernel 2023-12-19 5:43 ` Borah, Chaitanya Kumar @ 2023-12-19 7:00 ` Kamil Konieczny 2023-12-22 12:18 ` Lionel Landwerlin 0 siblings, 1 reply; 16+ messages in thread From: Kamil Konieczny @ 2023-12-19 7:00 UTC (permalink / raw) To: igt-dev; +Cc: Garg, Nemesa 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...] > ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] lib: sync i915_pciids.h with kernel 2023-12-19 7:00 ` Kamil Konieczny @ 2023-12-22 12:18 ` Lionel Landwerlin 2024-01-05 13:26 ` Jani Nikula 0 siblings, 1 reply; 16+ messages in thread From: Lionel Landwerlin @ 2023-12-22 12:18 UTC (permalink / raw) To: Kamil Konieczny, igt-dev, Borah, Chaitanya Kumar, Juha-Pekka Heikkila, Garg, Nemesa, Roper, Matthew D 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...] ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] lib: sync i915_pciids.h with kernel 2023-12-22 12:18 ` Lionel Landwerlin @ 2024-01-05 13:26 ` Jani Nikula 2024-01-05 13:35 ` Lionel Landwerlin 0 siblings, 1 reply; 16+ messages in thread From: Jani Nikula @ 2024-01-05 13:26 UTC (permalink / raw) To: Lionel Landwerlin, Kamil Konieczny, igt-dev, Borah, Chaitanya Kumar, Juha-Pekka Heikkila, Garg, Nemesa, Roper, Matthew D 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 ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] lib: sync i915_pciids.h with kernel 2024-01-05 13:26 ` Jani Nikula @ 2024-01-05 13:35 ` Lionel Landwerlin 2024-01-05 13:47 ` Jani Nikula 0 siblings, 1 reply; 16+ messages in thread From: Lionel Landwerlin @ 2024-01-05 13:35 UTC (permalink / raw) To: Jani Nikula, Kamil Konieczny, igt-dev, Borah, Chaitanya Kumar, Juha-Pekka Heikkila, Garg, Nemesa, Roper, Matthew D 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 ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] lib: sync i915_pciids.h with kernel 2024-01-05 13:35 ` Lionel Landwerlin @ 2024-01-05 13:47 ` Jani Nikula 0 siblings, 0 replies; 16+ messages in thread From: Jani Nikula @ 2024-01-05 13:47 UTC (permalink / raw) To: Lionel Landwerlin, Kamil Konieczny, igt-dev, Borah, Chaitanya Kumar, Juha-Pekka Heikkila, Garg, Nemesa, Roper, Matthew D 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 ^ permalink raw reply [flat|nested] 16+ messages in thread
* ✗ Fi.CI.BUILD: failure for lib: sync i915_pciids.h with kernel (rev15) 2023-12-12 9:08 [PATCH] lib: sync i915_pciids.h with kernel Chaitanya Kumar Borah 2023-12-12 10:24 ` ✗ CI.xeBAT: failure for lib: sync i915_pciids.h with kernel (rev14) Patchwork 2023-12-13 13:17 ` [PATCH] lib: sync i915_pciids.h with kernel Juha-Pekka Heikkila @ 2023-12-14 5:03 ` Patchwork 2 siblings, 0 replies; 16+ messages in thread From: Patchwork @ 2023-12-14 5:03 UTC (permalink / raw) To: Borah, Chaitanya Kumar; +Cc: igt-dev == Series Details == Series: lib: sync i915_pciids.h with kernel (rev15) URL : https://patchwork.freedesktop.org/series/50957/ State : failure == Summary == Applying: lib: sync i915_pciids.h with kernel Using index info to reconstruct a base tree... Patch failed at 0001 lib: sync i915_pciids.h with kernel When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". ^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH] lib: sync i915_pciids.h with kernel
@ 2024-03-27 20:12 Ravi Kumar Vodapalli
2024-03-28 19:32 ` Matt Roper
0 siblings, 1 reply; 16+ messages in thread
From: Ravi Kumar Vodapalli @ 2024-03-27 20:12 UTC (permalink / raw)
To: igt-dev
Cc: balasubramani.vivekanandan, matthew.d.roper, lucas.demarchi,
gustavo.sousa, radhakrishna.sripada, clinton.a.taylor,
matthew.s.atwood, dnyaneshwar.bhadane, haridhar.kalvala,
shekhar.chauhan
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
^ permalink raw reply related [flat|nested] 16+ messages in thread* Re: [PATCH] lib: sync i915_pciids.h with kernel 2024-03-27 20:12 [PATCH] lib: sync i915_pciids.h with kernel Ravi Kumar Vodapalli @ 2024-03-28 19:32 ` Matt Roper 0 siblings, 0 replies; 16+ messages in thread From: Matt Roper @ 2024-03-28 19:32 UTC (permalink / raw) To: Ravi Kumar Vodapalli Cc: igt-dev, balasubramani.vivekanandan, lucas.demarchi, gustavo.sousa, radhakrishna.sripada, clinton.a.taylor, matthew.s.atwood, dnyaneshwar.bhadane, haridhar.kalvala, shekhar.chauhan 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 ^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2024-03-28 19:32 UTC | newest] Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2023-12-12 9:08 [PATCH] lib: sync i915_pciids.h with kernel Chaitanya Kumar Borah 2023-12-12 10:24 ` ✗ CI.xeBAT: failure for lib: sync i915_pciids.h with kernel (rev14) Patchwork 2023-12-13 13:17 ` [PATCH] lib: sync i915_pciids.h with kernel Juha-Pekka Heikkila 2023-12-14 4:48 ` Borah, Chaitanya Kumar 2023-12-14 14:36 ` Kamil Konieczny 2023-12-18 10:14 ` Borah, Chaitanya Kumar 2023-12-18 16:19 ` Kamil Konieczny 2023-12-19 5:43 ` Borah, Chaitanya Kumar 2023-12-19 7:00 ` Kamil Konieczny 2023-12-22 12:18 ` Lionel Landwerlin 2024-01-05 13:26 ` Jani Nikula 2024-01-05 13:35 ` Lionel Landwerlin 2024-01-05 13:47 ` Jani Nikula 2023-12-14 5:03 ` ✗ Fi.CI.BUILD: failure for lib: sync i915_pciids.h with kernel (rev15) Patchwork 2024-03-27 20:12 [PATCH] lib: sync i915_pciids.h with kernel Ravi Kumar Vodapalli 2024-03-28 19:32 ` Matt Roper
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.