Skip to contentSkip to conversation

lib/amdgpu: fix amd dispatch issue

PATCH In review Jesse Zhang 3 participants 5 messages Jul 9, 2024 – Jul 10, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 lib/amdgpu: fix amd dispatch issue

1. Fixed failure of querying ip info on gfx when only compute ring is enabled
2. Set different invalid addresses for multiple rings

---
 lib/amdgpu/amd_dispatch.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
lib/amdgpu/amd_dispatch.c +5 -5
index 12ef7874c..8b97ca269 100644
@@ -233,7 +233,7 @@ amdgpu_memcpy_dispatch_test(amdgpu_device_handle device_handle,
 	base_cmd->emit(base_cmd, PACKET3_COMPUTE(PKT3_SET_SH_REG, 4));
 	base_cmd->emit(base_cmd, 0x240);
 	if (hang == BACKEND_SE_GC_SHADER_INVALID_USER_DATA) {
-		base_cmd->emit(base_cmd, mc_address_src);
+		base_cmd->emit(base_cmd, mc_address_src + ring * 0x1000);
 		base_cmd->emit(base_cmd, 0);
 	} else {
 		base_cmd->emit(base_cmd, mc_address_src);
@@ -254,11 +254,11 @@ amdgpu_memcpy_dispatch_test(amdgpu_device_handle device_handle,
 	base_cmd->emit(base_cmd, PACKET3_COMPUTE(PKT3_SET_SH_REG, 4));
 	base_cmd->emit(base_cmd, 0x244);
 	if (hang == BACKEND_SE_GC_SHADER_INVALID_USER_DATA) {
-		base_cmd->emit(base_cmd, mc_address_src);
+		base_cmd->emit(base_cmd, mc_address_dst + ring * 0x1000);
 		base_cmd->emit(base_cmd, 0);
 	} else {
-		base_cmd->emit(base_cmd, mc_address_src);
-		base_cmd->emit(base_cmd, (mc_address_src >> 32) | 0x100000);
+		base_cmd->emit(base_cmd, mc_address_dst);
+		base_cmd->emit(base_cmd, (mc_address_dst >> 32) | 0x100000);
 	}
 	base_cmd->emit(base_cmd, 0x400);
 	if (version == 9)
@@ -553,7 +553,7 @@ void amdgpu_gfx_dispatch_test(amdgpu_device_handle device_handle, uint32_t ip_ty
 	struct drm_amdgpu_info_hw_ip info;
 	uint32_t ring_id, version;
 
-	r = amdgpu_query_hw_ip_info(device_handle, AMDGPU_HW_IP_GFX, 0, &info);
+	r = amdgpu_query_hw_ip_info(device_handle, ip_type, 0, &info);
 	igt_assert_eq(r, 0);
 	if (!info.available_rings)
 		igt_info("SKIP ... as there's no graphics ring\n");
Signature · 1 line
2.25.1
#1 lore raw

✓ CI.xeBAT: success for lib/amdgpu: fix amd dispatch issue

== Series Details ==

== Series Details ==

Series: lib/amdgpu: fix amd dispatch issue
URL : https://patchwork.freedesktop.org/series/135885/
State : success

== Summary ==

CI Bug Log - changes from XEIGT_7920_BAT -> XEIGTPW_11384_BAT
====================================================

Summary
-------

**SUCCESS**

No regressions found.

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

No changes in participating hosts

Changes
-------

No changes found

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

* IGT: IGT_7920 -> IGTPW_11384
* Linux: xe-1576-1b010bec39a554cbbd0b51cbf49142e2f218013d -> xe-1578-fe74acc80d474524b2da613714a8d1a25adf648c

IGTPW_11384: 11384
IGT_7920: 7920
xe-1576-1b010bec39a554cbbd0b51cbf49142e2f218013d: 1b010bec39a554cbbd0b51cbf49142e2f218013d xe-1578-fe74acc80d474524b2da613714a8d1a25adf648c: fe74acc80d474524b2da613714a8d1a25adf648c

== Logs ==

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

#2 lore raw

✓ Fi.CI.BAT: success for lib/amdgpu: fix amd dispatch issue

In reply to Jesse Zhang
== Series Details ==

== Series Details ==

Series: lib/amdgpu: fix amd dispatch issue
URL : https://patchwork.freedesktop.org/series/135885/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_15047 -> IGTPW_11384
====================================================

Summary
-------

**SUCCESS**

No regressions found.

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

Participating hosts (40 -> 37)
------------------------------

Missing (3): bat-kbl-2 bat-dg2-11 fi-snb-2520m

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

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

### IGT changes ###

#### Issues hit ####

* igt@kms_pipe_crc_basic@nonblocking-crc:
- bat-arls-5: NOTRUN -> [INCOMPLETE][1] ([i915#11320])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_11384/bat-arls-5/igt@[email protected]

[i915#11320]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11320

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

* CI: CI-20190529 -> None
* IGT: IGT_7920 -> IGTPW_11384

CI-20190529: 20190529
CI_DRM_15047: fe74acc80d474524b2da613714a8d1a25adf648c @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_11384: 11384
IGT_7920: 7920

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_11384/index.html

#3 lore raw

✓ CI.xeFULL: success for lib/amdgpu: fix amd dispatch issue

In reply to Jesse Zhang
== Series Details ==

== Series Details ==

Series: lib/amdgpu: fix amd dispatch issue
URL : https://patchwork.freedesktop.org/series/135885/
State : success

== Summary ==

CI Bug Log - changes from XEIGT_7920_full -> XEIGTPW_11384_full
====================================================

Summary
-------

**SUCCESS**

No regressions found.

Participating hosts (3 -> 3)
------------------------------

No changes in participating hosts

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

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

### IGT changes ###

#### Suppressed ####

The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.

* igt@xe_sysfs_scheduler@timeslice_duration_us-min-max:
- {shard-lnl}: [PASS][1] -> [INCOMPLETE][2] +1 other test incomplete
[1]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7920/shard-lnl-7/igt@xe_sysfs_scheduler@timeslice_duration_us-min-max.html
[2]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-lnl-1/igt@xe_sysfs_scheduler@timeslice_duration_us-min-max.html

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

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

### IGT changes ###

#### Issues hit ####

* igt@kms_addfb_basic@addfb25-y-tiled-small-legacy:
- shard-dg2-set2: NOTRUN -> [SKIP][3] ([Intel XE#1201] / [Intel XE#623])
[3]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-dg2-464/igt@[email protected]

* igt@kms_async_flips@invalid-async-flip:
- shard-dg2-set2: NOTRUN -> [SKIP][4] ([Intel XE#1201] / [Intel XE#873])
[4]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-dg2-433/igt@[email protected]

* igt@kms_big_fb@y-tiled-max-hw-stride-32bpp-rotate-180:
- shard-dg2-set2: NOTRUN -> [SKIP][5] ([Intel XE#1124] / [Intel XE#1201]) +2 other tests skip
[5]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-dg2-436/igt@[email protected]

* igt@kms_bw@linear-tiling-4-displays-2560x1440p:
- shard-dg2-set2: NOTRUN -> [SKIP][6] ([Intel XE#1201] / [Intel XE#367])
[6]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-dg2-463/igt@[email protected]

* igt@kms_ccs@bad-rotation-90-4-tiled-xe2-ccs:
- shard-dg2-set2: NOTRUN -> [SKIP][7] ([Intel XE#1201] / [Intel XE#1252])
[7]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-dg2-435/igt@[email protected]

* igt@kms_ccs@crc-sprite-planes-basic-yf-tiled-ccs@pipe-d-hdmi-a-6:
- shard-dg2-set2: NOTRUN -> [SKIP][8] ([Intel XE#1201] / [Intel XE#787]) +27 other tests skip
[8]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-dg2-466/igt@kms_ccs@[email protected]

* igt@kms_ccs@random-ccs-data-y-tiled-gen12-mc-ccs@pipe-d-dp-4:
- shard-dg2-set2: NOTRUN -> [SKIP][9] ([Intel XE#1201] / [Intel XE#455] / [Intel XE#787]) +7 other tests skip
[9]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-dg2-466/igt@kms_ccs@[email protected]

* igt@kms_chamelium_hpd@dp-hpd-storm-disable:
- shard-dg2-set2: NOTRUN -> [SKIP][10] ([Intel XE#1201] / [Intel XE#373])
[10]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-dg2-466/igt@[email protected]

* igt@kms_cursor_crc@cursor-onscreen-512x170:
- shard-dg2-set2: NOTRUN -> [SKIP][11] ([Intel XE#1201] / [Intel XE#308]) +1 other test skip
[11]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-dg2-436/igt@[email protected]

* igt@kms_flip@2x-flip-vs-suspend-interruptible@cd-hdmi-a6-dp4:
- shard-dg2-set2: [PASS][12] -> [INCOMPLETE][13] ([Intel XE#1195]) +2 other tests incomplete
[12]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7920/shard-dg2-466/igt@kms_flip@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-dg2-463/igt@kms_flip@[email protected]

* igt@kms_frontbuffer_tracking@fbcdrrs-shrfb-scaledprimary:
- shard-dg2-set2: NOTRUN -> [SKIP][14] ([Intel XE#1201] / [Intel XE#651]) +11 other tests skip
[14]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-dg2-464/igt@[email protected]

* igt@kms_frontbuffer_tracking@psr-1p-primscrn-shrfb-pgflip-blt:
- shard-dg2-set2: NOTRUN -> [SKIP][15] ([Intel XE#1201] / [Intel XE#653]) +11 other tests skip
[15]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-dg2-464/igt@[email protected]

* igt@kms_panel_fitting@atomic-fastset:
- shard-dg2-set2: NOTRUN -> [SKIP][16] ([Intel XE#1201] / [Intel XE#455]) +4 other tests skip
[16]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-dg2-464/igt@[email protected]

* igt@kms_plane_scaling@intel-max-src-size@pipe-a-hdmi-a-6:
- shard-dg2-set2: [PASS][17] -> [FAIL][18] ([Intel XE#361])
[17]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7920/shard-dg2-463/igt@kms_plane_scaling@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-dg2-466/igt@kms_plane_scaling@[email protected]

* igt@kms_psr2_sf@overlay-plane-update-continuous-sf:
- shard-dg2-set2: NOTRUN -> [SKIP][19] ([Intel XE#1201] / [Intel XE#1489]) +1 other test skip
[19]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-dg2-435/igt@[email protected]

* igt@kms_psr@psr-sprite-plane-onoff:
- shard-dg2-set2: NOTRUN -> [SKIP][20] ([Intel XE#1201] / [Intel XE#929]) +4 other tests skip
[20]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-dg2-464/igt@[email protected]

* igt@kms_rotation_crc@primary-y-tiled-reflect-x-180:
- shard-dg2-set2: NOTRUN -> [SKIP][21] ([Intel XE#1127] / [Intel XE#1201])
[21]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-dg2-433/igt@[email protected]

* igt@kms_universal_plane@cursor-fb-leak@pipe-a-hdmi-a-6:
- shard-dg2-set2: [PASS][22] -> [FAIL][23] ([Intel XE#899])
[22]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7920/shard-dg2-464/igt@kms_universal_plane@[email protected]
[23]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-dg2-463/igt@kms_universal_plane@[email protected]

* igt@sriov_basic@bind-unbind-vf:
- shard-dg2-set2: NOTRUN -> [SKIP][24] ([Intel XE#1091] / [Intel XE#1201])
[24]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-dg2-434/igt@[email protected]

* igt@xe_evict@evict-beng-mixed-threads-large:
- shard-dg2-set2: [PASS][25] -> [TIMEOUT][26] ([Intel XE#1473] / [Intel XE#392])
[25]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7920/shard-dg2-434/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-dg2-435/igt@[email protected]

* igt@xe_evict@evict-mixed-many-threads-small:
- shard-dg2-set2: [PASS][27] -> [TIMEOUT][28] ([Intel XE#1473])
[27]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7920/shard-dg2-435/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-dg2-466/igt@[email protected]

* igt@xe_exec_fault_mode@twice-userptr-rebind-imm:
- shard-dg2-set2: NOTRUN -> [SKIP][29] ([Intel XE#1201] / [Intel XE#288]) +7 other tests skip
[29]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-dg2-464/igt@[email protected]

* igt@xe_pat@display-vs-wb-transient:
- shard-dg2-set2: NOTRUN -> [SKIP][30] ([Intel XE#1201] / [Intel XE#1337])
[30]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-dg2-464/igt@[email protected]

* igt@xe_pm@s3-vm-bind-prefetch:
- shard-dg2-set2: [PASS][31] -> [DMESG-WARN][32] ([Intel XE#1214] / [Intel XE#569])
[31]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7920/shard-dg2-435/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-dg2-433/igt@[email protected]

* igt@xe_pm@s3-vm-bind-userptr:
- shard-dg2-set2: [PASS][33] -> [DMESG-WARN][34] ([Intel XE#1214] / [Intel XE#1551] / [Intel XE#569])
[33]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7920/shard-dg2-463/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-dg2-466/igt@[email protected]

* igt@xe_pm@s4-basic-exec:
- shard-dg2-set2: [PASS][35] -> [DMESG-WARN][36] ([Intel XE#1214]) +1 other test dmesg-warn
[35]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7920/shard-dg2-463/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-dg2-436/igt@[email protected]

* igt@xe_pm@vram-d3cold-threshold:
- shard-dg2-set2: NOTRUN -> [SKIP][37] ([Intel XE#1201] / [Intel XE#579])
[37]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-dg2-466/igt@[email protected]

* igt@xe_query@multigpu-query-mem-usage:
- shard-dg2-set2: NOTRUN -> [SKIP][38] ([Intel XE#1201] / [Intel XE#944])
[38]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-dg2-434/igt@[email protected]

#### Possible fixes ####

* igt@kms_async_flips@alternate-sync-async-flip@pipe-b-dp-4:
- shard-dg2-set2: [FAIL][39] ([Intel XE#827]) -> [PASS][40] +1 other test pass
[39]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7920/shard-dg2-434/igt@kms_async_flips@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-dg2-463/igt@kms_async_flips@[email protected]

* igt@kms_big_fb@4-tiled-max-hw-stride-64bpp-rotate-0-hflip:
- {shard-lnl}: [FAIL][41] ([Intel XE#1659]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7920/shard-lnl-6/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-lnl-3/igt@[email protected]

* igt@kms_flip@flip-vs-suspend:
- shard-dg2-set2: [INCOMPLETE][43] ([Intel XE#1195] / [Intel XE#1551] / [Intel XE#2049]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7920/shard-dg2-466/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-dg2-463/igt@[email protected]

* igt@kms_flip@flip-vs-suspend@a-dp4:
- shard-dg2-set2: [INCOMPLETE][45] ([Intel XE#1195]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7920/shard-dg2-466/igt@kms_flip@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-dg2-463/igt@kms_flip@[email protected]

* igt@kms_flip@flip-vs-suspend@a-hdmi-a6:
- shard-dg2-set2: [DMESG-WARN][47] ([Intel XE#1214] / [Intel XE#1551]) -> [PASS][48]
[47]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7920/shard-dg2-466/igt@kms_flip@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-dg2-463/igt@kms_flip@[email protected]

* igt@kms_pipe_crc_basic@suspend-read-crc:
- shard-dg2-set2: [DMESG-WARN][49] ([Intel XE#1162] / [Intel XE#1214]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7920/shard-dg2-435/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-dg2-435/igt@[email protected]

* igt@kms_plane@plane-position-covered:
- {shard-lnl}: [DMESG-WARN][51] ([Intel XE#324]) -> [PASS][52] +1 other test pass
[51]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7920/shard-lnl-8/igt@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-lnl-7/igt@[email protected]

* igt@kms_pm_dc@dc6-psr:
- {shard-lnl}: [FAIL][53] ([Intel XE#1430]) -> [PASS][54]
[53]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7920/shard-lnl-1/igt@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-lnl-3/igt@[email protected]

* igt@kms_universal_plane@cursor-fb-leak@pipe-b-dp-4:
- shard-dg2-set2: [FAIL][55] ([Intel XE#899]) -> [PASS][56]
[55]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7920/shard-dg2-464/igt@kms_universal_plane@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-dg2-463/igt@kms_universal_plane@[email protected]

* igt@xe_evict@evict-large-multi-vm-cm:
- shard-dg2-set2: [FAIL][57] ([Intel XE#1600]) -> [PASS][58]
[57]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7920/shard-dg2-436/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-dg2-463/igt@[email protected]

* igt@xe_exec_reset@parallel-gt-reset:
- shard-dg2-set2: [TIMEOUT][59] ([Intel XE#2105]) -> [PASS][60]
[59]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7920/shard-dg2-433/igt@[email protected]
[60]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-dg2-434/igt@[email protected]

* igt@xe_exec_threads@threads-bal-shared-vm-userptr-rebind:
- shard-dg2-set2: [FAIL][61] -> [PASS][62]
[61]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7920/shard-dg2-466/igt@[email protected]
[62]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-dg2-435/igt@[email protected]

* igt@xe_pm@s3-d3hot-basic-exec:
- shard-dg2-set2: [DMESG-WARN][63] ([Intel XE#1214] / [Intel XE#1551] / [Intel XE#569]) -> [PASS][64]
[63]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7920/shard-dg2-464/igt@[email protected]
[64]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-dg2-463/igt@[email protected]

* igt@xe_pm@s4-d3hot-basic-exec:
- shard-dg2-set2: [DMESG-WARN][65] ([Intel XE#1214]) -> [PASS][66] +4 other tests pass
[65]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7920/shard-dg2-464/igt@[email protected]
[66]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-dg2-466/igt@[email protected]

#### Warnings ####

* igt@kms_content_protection@legacy@pipe-a-dp-4:
- shard-dg2-set2: [INCOMPLETE][67] ([Intel XE#1195]) -> [FAIL][68] ([Intel XE#1178]) +1 other test fail
[67]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7920/shard-dg2-436/igt@kms_content_protection@[email protected]
[68]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-dg2-435/igt@kms_content_protection@[email protected]

* igt@kms_flip@2x-flip-vs-suspend-interruptible:
- shard-dg2-set2: [DMESG-WARN][69] ([Intel XE#1214]) -> [INCOMPLETE][70] ([Intel XE#1195])
[69]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7920/shard-dg2-466/igt@[email protected]
[70]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-dg2-463/igt@[email protected]

* igt@kms_plane@plane-panning-bottom-right-suspend@pipe-b:
- shard-dg2-set2: [DMESG-FAIL][71] ([Intel XE#1551]) -> [FAIL][72] ([Intel XE#616]) +1 other test fail
[71]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7920/shard-dg2-466/igt@kms_plane@[email protected]
[72]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-dg2-435/igt@kms_plane@[email protected]

* igt@xe_evict@evict-beng-threads-large:
- shard-dg2-set2: [TIMEOUT][73] ([Intel XE#1473]) -> [INCOMPLETE][74] ([Intel XE#1195] / [Intel XE#1473])
[73]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7920/shard-dg2-436/igt@[email protected]
[74]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-dg2-466/igt@[email protected]

* igt@xe_evict@evict-mixed-many-threads-large:
- shard-dg2-set2: [TIMEOUT][75] ([Intel XE#1041] / [Intel XE#1473] / [Intel XE#392]) -> [INCOMPLETE][76] ([Intel XE#1195] / [Intel XE#1473] / [Intel XE#392])
[75]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7920/shard-dg2-433/igt@[email protected]
[76]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-dg2-433/igt@[email protected]

* igt@xe_evict@evict-threads-large:
- shard-dg2-set2: [INCOMPLETE][77] ([Intel XE#1195] / [Intel XE#1473] / [Intel XE#392]) -> [TIMEOUT][78] ([Intel XE#1473] / [Intel XE#392])
[77]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7920/shard-dg2-466/igt@[email protected]
[78]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_11384/shard-dg2-435/igt@[email protected]

{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).

[Intel XE#1041]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1041
[Intel XE#1062]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1062
[Intel XE#1091]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1091
[Intel XE#1124]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1124
[Intel XE#1127]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1127
[Intel XE#1162]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1162
[Intel XE#1178]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1178
[Intel XE#1192]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1192
[Intel XE#1195]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1195
[Intel XE#1201]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1201
[Intel XE#1214]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1214
[Intel XE#1252]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1252
[Intel XE#1337]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1337
[Intel XE#1358]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1358
[Intel XE#1392]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1392
[Intel XE#1399]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1399
[Intel XE#1401]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1401
[Intel XE#1406]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1406
[Intel XE#1407]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1407
[Intel XE#1413]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1413
[Intel XE#1421]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1421
[Intel XE#1424]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1424
[Intel XE#1430]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1430
[Intel XE#1435]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1435
[Intel XE#1442]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1442
[Intel XE#1473]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1473
[Intel XE#1489]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1489
[Intel XE#1551]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1551
[Intel XE#1600]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1600
[Intel XE#1607]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1607
[Intel XE#1649]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1649
[Intel XE#1659]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1659
[Intel XE#1745]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1745
[Intel XE#1760]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/1760
[Intel XE#2049]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2049
[Intel XE#2105]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2105
[Intel XE#2191]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2191
[Intel XE#2207]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/2207
[Intel XE#288]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/288
[Intel XE#305]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/305
[Intel XE#306]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/306
[Intel XE#307]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/307
[Intel XE#308]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/308
[Intel XE#309]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/309
[Intel XE#323]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/323
[Intel XE#324]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/324
[Intel XE#361]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/361
[Intel XE#366]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/366
[Intel XE#367]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/367
[Intel XE#373]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/373
[Intel XE#374]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/374
[Intel XE#392]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/392
[Intel XE#455]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/455
[Intel XE#569]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/569
[Intel XE#579]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/579
[Intel XE#584]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/584
[Intel XE#599]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/599
[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#651]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/651
[Intel XE#653]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/653
[Intel XE#656]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/656
[Intel XE#688]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/688
[Intel XE#702]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/702
[Intel XE#787]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/787
[Intel XE#827]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/827
[Intel XE#873]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/873
[Intel XE#899]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/899
[Intel XE#911]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/911
[Intel XE#929]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/929
[Intel XE#944]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/944
[Intel XE#958]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/958

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

* IGT: IGT_7920 -> IGTPW_11384
* Linux: xe-1576-1b010bec39a554cbbd0b51cbf49142e2f218013d -> xe-1578-fe74acc80d474524b2da613714a8d1a25adf648c

IGTPW_11384: 11384
IGT_7920: 7920
xe-1576-1b010bec39a554cbbd0b51cbf49142e2f218013d: 1b010bec39a554cbbd0b51cbf49142e2f218013d xe-1578-fe74acc80d474524b2da613714a8d1a25adf648c: fe74acc80d474524b2da613714a8d1a25adf648c

== Logs ==

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

Reviewed-by on v1 1/1
#4 lore raw
In reply to Jesse Zhang

The change looks good to me.

Quoted 46 lines · Jesse Zhang

1. Fixed failure of querying ip info on gfx when only compute ring is enabled
2. Set different invalid addresses for multiple rings

---
 lib/amdgpu/amd_dispatch.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
lib/amdgpu/amd_dispatch.c +5 -5
index 12ef7874c..8b97ca269 100644
@@ -233,7 +233,7 @@ amdgpu_memcpy_dispatch_test(amdgpu_device_handle device_handle,
 	base_cmd->emit(base_cmd, PACKET3_COMPUTE(PKT3_SET_SH_REG, 4));
 	base_cmd->emit(base_cmd, 0x240);
 	if (hang == BACKEND_SE_GC_SHADER_INVALID_USER_DATA) {
-		base_cmd->emit(base_cmd, mc_address_src);
+		base_cmd->emit(base_cmd, mc_address_src + ring * 0x1000);
 		base_cmd->emit(base_cmd, 0);
 	} else {
 		base_cmd->emit(base_cmd, mc_address_src);
@@ -254,11 +254,11 @@ amdgpu_memcpy_dispatch_test(amdgpu_device_handle device_handle,
 	base_cmd->emit(base_cmd, PACKET3_COMPUTE(PKT3_SET_SH_REG, 4));
 	base_cmd->emit(base_cmd, 0x244);
 	if (hang == BACKEND_SE_GC_SHADER_INVALID_USER_DATA) {
-		base_cmd->emit(base_cmd, mc_address_src);
+		base_cmd->emit(base_cmd, mc_address_dst + ring * 0x1000);
 		base_cmd->emit(base_cmd, 0);
 	} else {
-		base_cmd->emit(base_cmd, mc_address_src);
-		base_cmd->emit(base_cmd, (mc_address_src >> 32) | 0x100000);
+		base_cmd->emit(base_cmd, mc_address_dst);
+		base_cmd->emit(base_cmd, (mc_address_dst >> 32) | 0x100000);
 	}
 	base_cmd->emit(base_cmd, 0x400);
 	if (version == 9)
@@ -553,7 +553,7 @@ void amdgpu_gfx_dispatch_test(amdgpu_device_handle device_handle, uint32_t ip_ty
 	struct drm_amdgpu_info_hw_ip info;
 	uint32_t ring_id, version;
 
-	r = amdgpu_query_hw_ip_info(device_handle, AMDGPU_HW_IP_GFX, 0, &info);
+	r = amdgpu_query_hw_ip_info(device_handle, ip_type, 0, &info);
 	igt_assert_eq(r, 0);
 	if (!info.available_rings)
 		igt_info("SKIP ... as there's no graphics ring\n");