From: Jesse Zhang <jesse.zhang@amd.com>
To: <igt-dev@lists.freedesktop.org>
Cc: Tim Huang <tim.huang@amd.com>,
Luben Tuikov <luben.tuikov@amd.com>,
Alex Deucher <alexander.deucher@amd.com>,
Christian Koenig <christian.koenig@amd.com>
Subject: [igt-dev] [PATCH V2 i-g-t] test/amdgpu: add apu check for pciplug test
Date: Tue, 7 Nov 2023 11:37:33 +0800 [thread overview]
Message-ID: <20231107033733.2772666-1-jesse.zhang@amd.com> (raw)
For apu, it is integrated with cpu.
So hotplug test should be unnecessary for it.
V2:
-IGT built-in approach to check this condition
in the fixture function. (Vitlay)
Cc: Vitaly Prosyak <vitaly.prosyak@amd.com>
Cc: Luben Tuikov <luben.tuikov@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Christian Koenig <christian.koenig@amd.com>
Cc: Tim Huang <tim.huang@amd.com>
Cc: Kamil Konieczny <kamil.konieczny@linux.intel.com>
Signed-off-by: Jesse Zhang <Jesse.Zhang@amd.com>
Reviewed-by: Vitaly Prosyak <vitaly.prosyak@amd.com>
---
tests/amdgpu/amd_pci_unplug.c | 32 +++++++++++++++++++++++++++++++-
1 file changed, 31 insertions(+), 1 deletion(-)
diff --git a/tests/amdgpu/amd_pci_unplug.c b/tests/amdgpu/amd_pci_unplug.c
index 4c055b99f..22e053795 100644
--- a/tests/amdgpu/amd_pci_unplug.c
+++ b/tests/amdgpu/amd_pci_unplug.c
@@ -30,15 +30,42 @@
#include "lib/amdgpu/amd_pci_unplug.h"
#include "lib/amdgpu/amd_ip_blocks.h"
+static bool
+is_hot_plug_test_enable(amdgpu_device_handle device_handle, const struct amdgpu_gpu_info *gpu_info)
+{
+ bool enable = true;
+
+ /* skip hotplug test on APUs */
+ if (gpu_info->ids_flags & AMDGPU_IDS_FLAGS_FUSION) {
+ igt_info("Don't support hot plug on APUs, hot plug test is disabled\n");
+ enable = false;
+ }
+ return enable;
+}
igt_main
{
struct amd_pci_unplug_setup setup = {0};
struct amd_pci_unplug unplug = {0};
+ amdgpu_device_handle device;
+ struct amdgpu_gpu_info gpu_info = {};
+ int fd = -1;
igt_fixture {
+ uint32_t major, minor;
+ int err;
+
+ fd = drm_open_driver(DRIVER_AMDGPU);
+ err = amdgpu_device_initialize(fd, &major, &minor, &device);
+ igt_require(err == 0);
+ igt_info("Initialized amdgpu, driver version %d.%d\n",
+ major, minor);
+ err = amdgpu_query_gpu_info(device, &gpu_info);
+ igt_assert_eq(err, 0);
+
setup.minor_version_req = 46;
+ igt_skip_on(!is_hot_plug_test_enable(device, &gpu_info));
}
igt_subtest("amdgpu_hotunplug_simple")
@@ -54,5 +81,8 @@ igt_main
igt_subtest("amdgpu_hotunplug_with_exported_fence")
amdgpu_hotunplug_with_exported_fence(&setup, &unplug);
- igt_fixture { }
+ igt_fixture {
+ amdgpu_device_deinitialize(device);
+ drm_close_driver(fd);
+ }
}
--
2.25.1
next reply other threads:[~2023-11-07 3:37 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-07 3:37 Jesse Zhang [this message]
2023-11-07 4:37 ` [igt-dev] ✓ CI.xeBAT: success for test/amdgpu: add apu check for pciplug test Patchwork
2023-11-07 4:38 ` [igt-dev] ✓ Fi.CI.BAT: " Patchwork
2023-11-07 9:12 ` [igt-dev] [PATCH V2 i-g-t] " Kamil Konieczny
2023-11-07 18:31 ` vitaly prosyak
2023-11-07 12:57 ` [igt-dev] ✗ Fi.CI.IGT: failure for " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231107033733.2772666-1-jesse.zhang@amd.com \
--to=jesse.zhang@amd.com \
--cc=alexander.deucher@amd.com \
--cc=christian.koenig@amd.com \
--cc=igt-dev@lists.freedesktop.org \
--cc=luben.tuikov@amd.com \
--cc=tim.huang@amd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox