Skip to contentSkip to conversation

lib/amdgpu: add apu check for pciplug test

PATCH In review Jesse Zhang 2 participants 2 messages Nov 9, 2023

lore
Share & tools
lore
#0 lore raw

PATCH v4 2/3 lib/amdgpu: add apu check for pciplug test

It is integrated with cpu,
for APU(Accelerated Processing Unit CPU + iGPU). So hotplug test should be unnecessary for it.

V4:
- place the APU check in particular subtests.(Kamil)
- Add igt_info about skipping tests (Vitaly)

Cc Vitaly Prosyak <[email protected]>
Cc Luben Tuikov <[email protected]>
Cc Alex Deucher <[email protected]>
Cc Christian Koenig <[email protected]>
Cc Tim Huang <[email protected]>
Cc Kamil Konieczny <[email protected]>
---
 lib/amdgpu/amd_pci_unplug.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)
lib/amdgpu/amd_pci_unplug.c +12 -0
index 047a8700b..b7af95dec 100644
@@ -92,6 +92,7 @@ amdgpu_hotunplug_setup_test(bool render_mode, const struct amd_pci_unplug_setup
 	bool ret = false;
 	int r;
 	uint32_t  major_version, minor_version;
+	struct amdgpu_gpu_info gpu_info = {0};
 
 	unplug->num_devices = amdgpu_open_devices(render_mode, MAX_CARDS_SUPPORTED,
 											  unplug->drm_amdgpu_fds);
@@ -118,6 +119,12 @@ amdgpu_hotunplug_setup_test(bool render_mode, const struct amd_pci_unplug_setup
 	if (minor_version < setup->minor_version_req)
 		goto release;
 
+	/* skip hotplug test on APU (Accelerated Processing Unit CPU + iGPU) */
+	r = amdgpu_query_gpu_info(unplug->device_handle, &gpu_info);
+	igt_assert_eq(r, 0);
+	if (gpu_info.ids_flags & AMDGPU_IDS_FLAGS_FUSION)
+		igt_skip_on_f(!ret, "SKIP ... APU does not require this test\n");
+
 	if (!setup->open_device) {
 			/* device handle is not always required for test */
 			/* but for drm version is required always */
@@ -132,6 +139,11 @@ amdgpu_hotunplug_setup_test(bool render_mode, const struct amd_pci_unplug_setup
 			goto release;
 		if (minor_version < setup->minor_version_req)
 			goto release;
+
+		r = amdgpu_query_gpu_info(unplug->device_handle2, &gpu_info);
+		igt_assert_eq(r, 0);
+		if (gpu_info.ids_flags & AMDGPU_IDS_FLAGS_FUSION)
+			igt_skip_on_f(!ret, "SKIP ... APU does not require this test\n");
 	}
 	ret = true;
 release:
Signature · 1 line
2.25.1
#1 lore raw

Hi Jesse,

Quoted 2 lines · Jesse Zhang

It is integrated with cpu,
for APU(Accelerated Processing Unit CPU + iGPU).

Thank you for writing out what APU means.

Quoted 1 line

So hotplug test should be unnecessary for it.

I am not so sure about it, I will add Janusz to Cc
Cc: Janusz Krzysztofik <[email protected]>

Btw is core test: core_hotunplug working for amdgpu APU?

Quoted 31 lines

V4:
- place the APU check in particular subtests.(Kamil)
- Add igt_info about skipping tests (Vitaly)

Cc Vitaly Prosyak <[email protected]>
Cc Luben Tuikov <[email protected]>
Cc Alex Deucher <[email protected]>
Cc Christian Koenig <[email protected]>
Cc Tim Huang <[email protected]>
Cc Kamil Konieczny <[email protected]>
---
 lib/amdgpu/amd_pci_unplug.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)
lib/amdgpu/amd_pci_unplug.c +1 -0
index 047a8700b..b7af95dec 100644
@@ -92,6 +92,7 @@ amdgpu_hotunplug_setup_test(bool render_mode, const struct amd_pci_unplug_setup
 	bool ret = false;
 	int r;
 	uint32_t  major_version, minor_version;
+	struct amdgpu_gpu_info gpu_info = {0};
 
 	unplug->num_devices = amdgpu_open_devices(render_mode, MAX_CARDS_SUPPORTED,
 											  unplug->drm_amdgpu_fds);

lib/amdgpu/amd_pci_unplug.c amdgpu_hotunplug_setup_test(bool render_mode, const struct amd_pci_unplug_setup · line 126

Quoted 8 lines
lib/amdgpu/amd_pci_unplug.c +5 -0
@@ -118,6 +119,12 @@ amdgpu_hotunplug_setup_test(bool render_mode, const struct amd_pci_unplug_setup
 	if (minor_version < setup->minor_version_req)
 		goto release;
 
+	/* skip hotplug test on APU (Accelerated Processing Unit CPU + iGPU) */
+	r = amdgpu_query_gpu_info(unplug->device_handle, &gpu_info);
+	igt_assert_eq(r, 0);
+	if (gpu_info.ids_flags & AMDGPU_IDS_FLAGS_FUSION)
+		igt_skip_on_f(!ret, "SKIP ... APU does not require this test\n");

---------------------------- ^^^^^^^^
No need for SKIP, it will be printed by igt_skip_on.

lib/amdgpu/amd_pci_unplug.c amdgpu_hotunplug_setup_test(bool render_mode, const struct amd_pci_unplug_setup · line 146

Quoted 13 lines
lib/amdgpu/amd_pci_unplug.c +6 -0
+
 	if (!setup->open_device) {
 			/* device handle is not always required for test */
 			/* but for drm version is required always */
@@ -132,6 +139,11 @@ amdgpu_hotunplug_setup_test(bool render_mode, const struct amd_pci_unplug_setup
 			goto release;
 		if (minor_version < setup->minor_version_req)
 			goto release;
+
+		r = amdgpu_query_gpu_info(unplug->device_handle2, &gpu_info);
+		igt_assert_eq(r, 0);
+		if (gpu_info.ids_flags & AMDGPU_IDS_FLAGS_FUSION)
+			igt_skip_on_f(!ret, "SKIP ... APU does not require this test\n");

-------------------------------- ^^^^^^^^
Same here.

Regards,
Kamil

Quoted 6 lines
lib/amdgpu/amd_pci_unplug.c +0 -0
 	}
 	ret = true;
 release:
Signature · 1 line
2.25.1