From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2041.outbound.protection.outlook.com [40.107.236.41]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4110A10E1C8 for ; Mon, 25 Sep 2023 02:05:54 +0000 (UTC) From: Jesse Zhang To: Date: Mon, 25 Sep 2023 10:05:22 +0800 Message-ID: <20230925020522.3523365-1-jesse.zhang@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Subject: [igt-dev] [PATCH] tests/amd_deadlock: add reset subtest 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: Add an amdgpu reset test to the suite V2: - improve subject and description (Kamil,Luben) - sort the include alphabetically (Kamil) - Optimize some code (Luben) Signed-off-by: Jesse Zhang Signed-off-by: Tim Huang --- tests/amdgpu/amd_deadlock.c | 39 +++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/tests/amdgpu/amd_deadlock.c b/tests/amdgpu/amd_deadlock.c index d805b8d18..4063ac61b 100644 --- a/tests/amdgpu/amd_deadlock.c +++ b/tests/amdgpu/amd_deadlock.c @@ -23,6 +23,9 @@ * Based on libdrm/tests/amdgpu/deadlock_tests.c */ +#include +#include +#include #include "lib/amdgpu/amd_memory.h" #include "lib/amdgpu/amd_command_submission.h" #include "lib/amdgpu/amd_dispatch.h" @@ -70,6 +73,40 @@ amdgpu_gfx_illegal_mem_access(amdgpu_device_handle device_handle) bad_access_helper(device_handle, 0, AMDGPU_HW_IP_GFX); } +static void +amdgpu_gpu_reset_test(amdgpu_device_handle device_handle, int drm_amdgpu) +{ + amdgpu_context_handle context_handle; + char debugfs_path[256], tmp[10]; + uint32_t hang_state, hangs; + struct stat sbuf; + int r, fd; + + r = amdgpu_cs_ctx_create(device_handle, &context_handle); + igt_assert_eq(r, 0); + + r = fstat(drm_amdgpu, &sbuf); + igt_assert_eq(r, 0); + + sprintf(debugfs_path, "/sys/kernel/debug/dri/%d/amdgpu_gpu_recover", minor(sbuf.st_rdev)); + fd = open(debugfs_path, O_RDONLY); + igt_assert_fd(fd); + + r = read(fd, tmp, ARRAY_SIZE(tmp)); + igt_assert_lt(0,r); + + r = amdgpu_cs_query_reset_state(context_handle, &hang_state, &hangs); + igt_assert_eq(r, 0); + igt_assert_eq(hang_state, AMDGPU_CTX_UNKNOWN_RESET); + + close(fd); + r = amdgpu_cs_ctx_free(context_handle); + igt_assert_eq(r, 0); + + amdgpu_gfx_dispatch_test(device_handle, AMDGPU_HW_IP_GFX); + amdgpu_gfx_dispatch_test(device_handle, AMDGPU_HW_IP_COMPUTE); +} + igt_main { amdgpu_device_handle device; @@ -116,6 +153,8 @@ igt_main igt_subtest("dispatch_hang_slow_gfx") amdgpu_dispatch_hang_slow_gfx(device); + igt_subtest("amdgpu-reset-test") + amdgpu_gpu_reset_test(device,fd); igt_fixture { amdgpu_device_deinitialize(device); drm_close_driver(fd); -- 2.25.1