Skip to contentSkip to conversation

lib: Sync i915_pciids.h with kernel

PATCH Superseded Swathi Dhanavanthri 4 participants 4 messages Mar 26, 2020 Library code

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Swathi Dhanavanthri

author
#0 lore raw

PATCH v2 1/1 lib: Sync i915_pciids.h with kernel

Changes:
3882581753d1 ("drm/i915/tgl: Add new PCI IDs to TGL")
v2: Separated U series CML IDs to be in sync with kernel 8717c6b7414f ("Separate U series pci id from origianl list")

Signed-off-by Swathi Dhanavanthri <[email protected]>
---
 lib/i915_pciids.h | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)
lib/i915_pciids.h +19 -13
index 3e26a917..662d8351 100644
@@ -446,23 +446,18 @@
 
 /* CML GT1 */
 #define INTEL_CML_GT1_IDS(info)	\
-	INTEL_VGA_DEVICE(0x9B21, info), \
-	INTEL_VGA_DEVICE(0x9BAA, info), \
-	INTEL_VGA_DEVICE(0x9BAB, info), \
-	INTEL_VGA_DEVICE(0x9BAC, info), \
-	INTEL_VGA_DEVICE(0x9BA0, info), \
 	INTEL_VGA_DEVICE(0x9BA5, info), \
 	INTEL_VGA_DEVICE(0x9BA8, info), \
 	INTEL_VGA_DEVICE(0x9BA4, info), \
 	INTEL_VGA_DEVICE(0x9BA2, info)
 
+#define INTEL_CML_U_GT1_IDS(info) \
+	INTEL_VGA_DEVICE(0x9B21, info), \
+	INTEL_VGA_DEVICE(0x9BAA, info), \
+	INTEL_VGA_DEVICE(0x9BAC, info)
+
 /* CML GT2 */
 #define INTEL_CML_GT2_IDS(info)	\
-	INTEL_VGA_DEVICE(0x9B41, info), \
-	INTEL_VGA_DEVICE(0x9BCA, info), \
-	INTEL_VGA_DEVICE(0x9BCB, info), \
-	INTEL_VGA_DEVICE(0x9BCC, info), \
-	INTEL_VGA_DEVICE(0x9BC0, info), \
 	INTEL_VGA_DEVICE(0x9BC5, info), \
 	INTEL_VGA_DEVICE(0x9BC8, info), \
 	INTEL_VGA_DEVICE(0x9BC4, info), \

@@ -471,6 +466,11 @@
 	INTEL_VGA_DEVICE(0x9BE6, info), \
 	INTEL_VGA_DEVICE(0x9BF6, info)
 
+#define INTEL_CML_U_GT2_IDS(info) \
+	INTEL_VGA_DEVICE(0x9B41, info), \
+	INTEL_VGA_DEVICE(0x9BCA, info), \
+	INTEL_VGA_DEVICE(0x9BCC, info)
+
 #define INTEL_KBL_IDS(info) \
 	INTEL_KBL_GT1_IDS(info), \
 	INTEL_KBL_GT2_IDS(info), \

@@ -536,7 +536,9 @@
 	INTEL_WHL_U_GT3_IDS(info), \
 	INTEL_AML_CFL_GT2_IDS(info), \
 	INTEL_CML_GT1_IDS(info), \
-	INTEL_CML_GT2_IDS(info)
+	INTEL_CML_GT2_IDS(info), \
+	INTEL_CML_U_GT1_IDS(info), \
+	INTEL_CML_U_GT2_IDS(info)
 
 /* CNL */
 #define INTEL_CNL_PORT_F_IDS(info) \

@@ -591,12 +593,16 @@
 
 /* TGL */
 #define INTEL_TGL_12_IDS(info) \
-	INTEL_VGA_DEVICE(0x9A49, info), \
 	INTEL_VGA_DEVICE(0x9A40, info), \
+	INTEL_VGA_DEVICE(0x9A49, info), \
 	INTEL_VGA_DEVICE(0x9A59, info), \
 	INTEL_VGA_DEVICE(0x9A60, info), \
 	INTEL_VGA_DEVICE(0x9A68, info), \
 	INTEL_VGA_DEVICE(0x9A70, info), \
-	INTEL_VGA_DEVICE(0x9A78, info)
+	INTEL_VGA_DEVICE(0x9A78, info), \
+	INTEL_VGA_DEVICE(0x9AC0, info), \
+	INTEL_VGA_DEVICE(0x9AC9, info), \
+	INTEL_VGA_DEVICE(0x9AD9, info), \
+	INTEL_VGA_DEVICE(0x9AF8, info)
 
 #endif /* _I915_PCIIDS_H */
Signature · 6 lines
2.20.1

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
Reviewed-by on v2 1/1
#1 lore raw
Quoted 6 lines · Swathi Dhanavanthri

Changes:
3882581753d1 ("drm/i915/tgl: Add new PCI IDs to TGL")
v2: Separated U series CML IDs to be in sync with kernel 8717c6b7414f ("Separate U series pci id from origianl list")

Signed-off-by Swathi Dhanavanthri <[email protected]>

Matches the copy of the file in the kernel.

Reviewed-by Matt Roper <[email protected]>
Quoted 82 lines
---
 lib/i915_pciids.h | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)
lib/i915_pciids.h +19 -13
index 3e26a917..662d8351 100644
@@ -446,23 +446,18 @@
 
 /* CML GT1 */
 #define INTEL_CML_GT1_IDS(info)	\
-	INTEL_VGA_DEVICE(0x9B21, info), \
-	INTEL_VGA_DEVICE(0x9BAA, info), \
-	INTEL_VGA_DEVICE(0x9BAB, info), \
-	INTEL_VGA_DEVICE(0x9BAC, info), \
-	INTEL_VGA_DEVICE(0x9BA0, info), \
 	INTEL_VGA_DEVICE(0x9BA5, info), \
 	INTEL_VGA_DEVICE(0x9BA8, info), \
 	INTEL_VGA_DEVICE(0x9BA4, info), \
 	INTEL_VGA_DEVICE(0x9BA2, info)
 
+#define INTEL_CML_U_GT1_IDS(info) \
+	INTEL_VGA_DEVICE(0x9B21, info), \
+	INTEL_VGA_DEVICE(0x9BAA, info), \
+	INTEL_VGA_DEVICE(0x9BAC, info)
+
 /* CML GT2 */
 #define INTEL_CML_GT2_IDS(info)	\
-	INTEL_VGA_DEVICE(0x9B41, info), \
-	INTEL_VGA_DEVICE(0x9BCA, info), \
-	INTEL_VGA_DEVICE(0x9BCB, info), \
-	INTEL_VGA_DEVICE(0x9BCC, info), \
-	INTEL_VGA_DEVICE(0x9BC0, info), \
 	INTEL_VGA_DEVICE(0x9BC5, info), \
 	INTEL_VGA_DEVICE(0x9BC8, info), \
 	INTEL_VGA_DEVICE(0x9BC4, info), \

@@ -471,6 +466,11 @@
 	INTEL_VGA_DEVICE(0x9BE6, info), \
 	INTEL_VGA_DEVICE(0x9BF6, info)
 
+#define INTEL_CML_U_GT2_IDS(info) \
+	INTEL_VGA_DEVICE(0x9B41, info), \
+	INTEL_VGA_DEVICE(0x9BCA, info), \
+	INTEL_VGA_DEVICE(0x9BCC, info)
+
 #define INTEL_KBL_IDS(info) \
 	INTEL_KBL_GT1_IDS(info), \
 	INTEL_KBL_GT2_IDS(info), \

@@ -536,7 +536,9 @@
 	INTEL_WHL_U_GT3_IDS(info), \
 	INTEL_AML_CFL_GT2_IDS(info), \
 	INTEL_CML_GT1_IDS(info), \
-	INTEL_CML_GT2_IDS(info)
+	INTEL_CML_GT2_IDS(info), \
+	INTEL_CML_U_GT1_IDS(info), \
+	INTEL_CML_U_GT2_IDS(info)
 
 /* CNL */
 #define INTEL_CNL_PORT_F_IDS(info) \

@@ -591,12 +593,16 @@
 
 /* TGL */
 #define INTEL_TGL_12_IDS(info) \
-	INTEL_VGA_DEVICE(0x9A49, info), \
 	INTEL_VGA_DEVICE(0x9A40, info), \
+	INTEL_VGA_DEVICE(0x9A49, info), \
 	INTEL_VGA_DEVICE(0x9A59, info), \
 	INTEL_VGA_DEVICE(0x9A60, info), \
 	INTEL_VGA_DEVICE(0x9A68, info), \
 	INTEL_VGA_DEVICE(0x9A70, info), \
-	INTEL_VGA_DEVICE(0x9A78, info)
+	INTEL_VGA_DEVICE(0x9A78, info), \
+	INTEL_VGA_DEVICE(0x9AC0, info), \
+	INTEL_VGA_DEVICE(0x9AC9, info), \
+	INTEL_VGA_DEVICE(0x9AD9, info), \
+	INTEL_VGA_DEVICE(0x9AF8, info)
 
 #endif /* _I915_PCIIDS_H */
Signature · 1 line
2.20.1
Signature · 9 lines
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation
(916) 356-2795
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
CI
#2 lore raw

[igt-dev] ✗ Fi.CI.BAT: failure for lib: sync i915_pciids.h with kernel (rev5)

In reply to Swathi Dhanavanthri
== Series Details ==

== Series Details ==

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

== Summary ==

CI Bug Log - changes from CI_DRM_8197 -> IGTPW_4360
====================================================

Summary
-------

**FAILURE**

Serious unknown changes coming with IGTPW_4360 absolutely need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in IGTPW_4360, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4360/index.html

Possible new issues
-------------------

Here are the unknown changes that may have been introduced in IGTPW_4360:

### IGT changes ###

#### Possible regressions ####

* igt@gem_exec_fence@basic-await:
- fi-cml-u2: NOTRUN -> [SKIP][1] +4 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4360/fi-cml-u2/igt@[email protected]

* igt@gem_sync@basic-each:
- fi-cml-u2: [PASS][2] -> [SKIP][3] +57 similar issues
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8197/fi-cml-u2/igt@[email protected]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4360/fi-cml-u2/igt@[email protected]

* igt@kms_addfb_basic@addfb25-y-tiled:
- fi-cml-u2: [PASS][4] -> [FAIL][5] +1 similar issue
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8197/fi-cml-u2/igt@[email protected]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4360/fi-cml-u2/igt@[email protected]

#### Warnings ####

* igt@amdgpu/amd_prime@i915-to-amd:
- fi-cml-u2: [SKIP][6] ([fdo#109315]) -> [SKIP][7] +1 similar issue
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8197/fi-cml-u2/igt@amdgpu/[email protected]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4360/fi-cml-u2/igt@amdgpu/[email protected]

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

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

### IGT changes ###

#### Issues hit ####

* igt@i915_selftest@live@execlists:
- fi-kbl-soraka: [PASS][8] -> [INCOMPLETE][9] ([fdo#112259] / [i915#656])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8197/fi-kbl-soraka/igt@i915_selftest@[email protected]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4360/fi-kbl-soraka/igt@i915_selftest@[email protected]

#### Possible fixes ####

* igt@i915_selftest@live@late_gt_pm:
- fi-bwr-2160: [INCOMPLETE][10] -> [PASS][11]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8197/fi-bwr-2160/igt@i915_selftest@live@late_gt_pm.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4360/fi-bwr-2160/igt@i915_selftest@live@late_gt_pm.html

[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#112259]: https://bugs.freedesktop.org/show_bug.cgi?id=112259
[i915#656]: https://gitlab.freedesktop.org/drm/intel/issues/656

Participating hosts (44 -> 41)
------------------------------

Additional (2): fi-kbl-r fi-kbl-7500u
Missing (5): fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-kbl-7560u fi-bdw-samus

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

* CI: CI-20190529 -> None
* IGT: IGT_5539 -> IGTPW_4360

CI-20190529: 20190529
CI_DRM_8197: 198bab1da198b9d6d5c36d52704dd4abab6e81a8 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_4360: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4360/index.html
IGT_5539: e7aae12e37771a8b7796ba252574eb832a5839c3 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4360/index.html
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev

#3 lore raw

Re: [igt-dev] ✗ Fi.CI.BAT: failure for lib: sync i915_pciids.h with kernel (rev5)

Quoted 43 lines · Patchwork

== Series Details ==

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

== Summary ==

CI Bug Log - changes from CI_DRM_8197 -> IGTPW_4360
====================================================

Summary
-------

**FAILURE**

Serious unknown changes coming with IGTPW_4360 absolutely need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in IGTPW_4360, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4360/index.html

Possible new issues
-------------------

Here are the unknown changes that may have been introduced in IGTPW_4360:

### IGT changes ###

#### Possible regressions ####

* igt@gem_exec_fence@basic-await:
- fi-cml-u2: NOTRUN -> [SKIP][1] +4 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4360/fi-cml-u2/igt@[email protected]

* igt@gem_sync@basic-each:
- fi-cml-u2: [PASS][2] -> [SKIP][3] +57 similar issues
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8197/fi-cml-u2/igt@[email protected]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4360/fi-cml-u2/igt@[email protected]

Quoted 4 lines

* igt@kms_addfb_basic@addfb25-y-tiled:
- fi-cml-u2: [PASS][4] -> [FAIL][5] +1 similar issue
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8197/fi-cml-u2/igt@[email protected]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4360/fi-cml-u2/igt@[email protected]

Looks like lib/intel_device_info.c needs to be updated with the "U" version of the IDs

-James

Quoted 56 lines

#### Warnings ####

* igt@amdgpu/amd_prime@i915-to-amd:
- fi-cml-u2: [SKIP][6] ([fdo#109315]) -> [SKIP][7] +1 similar issue
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8197/fi-cml-u2/igt@amdgpu/[email protected]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4360/fi-cml-u2/igt@amdgpu/[email protected]

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

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

### IGT changes ###

#### Issues hit ####

* igt@i915_selftest@live@execlists:
- fi-kbl-soraka: [PASS][8] -> [INCOMPLETE][9] ([fdo#112259] / [i915#656])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8197/fi-kbl-soraka/igt@i915_selftest@[email protected]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4360/fi-kbl-soraka/igt@i915_selftest@[email protected]

#### Possible fixes ####

* igt@i915_selftest@live@late_gt_pm:
- fi-bwr-2160: [INCOMPLETE][10] -> [PASS][11]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8197/fi-bwr-2160/igt@i915_selftest@live@late_gt_pm.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4360/fi-bwr-2160/igt@i915_selftest@live@late_gt_pm.html

[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#112259]: https://bugs.freedesktop.org/show_bug.cgi?id=112259
[i915#656]: https://gitlab.freedesktop.org/drm/intel/issues/656

Participating hosts (44 -> 41)
------------------------------

Additional (2): fi-kbl-r fi-kbl-7500u
Missing (5): fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-kbl-7560u fi-bdw-samus

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

* CI: CI-20190529 -> None
* IGT: IGT_5539 -> IGTPW_4360

CI-20190529: 20190529
CI_DRM_8197: 198bab1da198b9d6d5c36d52704dd4abab6e81a8 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_4360: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4360/index.html
IGT_5539: e7aae12e37771a8b7796ba252574eb832a5839c3 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools

Quoted 7 lines

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4360/index.html
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev