From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2062.outbound.protection.outlook.com [40.107.94.62]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9744610E1AD for ; Thu, 9 Nov 2023 02:42:02 +0000 (UTC) From: Jesse Zhang To: Date: Thu, 9 Nov 2023 10:41:50 +0800 Message-ID: <20231109024150.2950150-1-jesse.zhang@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Subject: [igt-dev] [PATCH V4 i-g-t 2/3] lib/amdgpu: add apu check for pciplug test List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tim Huang , Luben Tuikov , Alex Deucher , Christian Koenig Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: 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 Cc: Luben Tuikov Cc: Alex Deucher Cc: Christian Koenig Cc: Tim Huang Cc: Kamil Konieczny Signed-off-by: Jesse Zhang Reviewed-by: Vitaly Prosyak --- lib/amdgpu/amd_pci_unplug.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/lib/amdgpu/amd_pci_unplug.c b/lib/amdgpu/amd_pci_unplug.c index 047a8700b..b7af95dec 100644 --- a/lib/amdgpu/amd_pci_unplug.c +++ b/lib/amdgpu/amd_pci_unplug.c @@ -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: -- 2.25.1