* [igt-dev] [PATCH i-g-t v2 0/2] vram d3cold threshold test
@ 2023-06-28 11:26 Anshuman Gupta
2023-06-28 11:26 ` [igt-dev] [PATCH i-g-t v2 1/2] tests/xe_pm : Add support to disable all crtc Anshuman Gupta
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Anshuman Gupta @ 2023-06-28 11:26 UTC (permalink / raw)
To: igt-dev; +Cc: badal.nilawar
Adding vram_d3cold_threshold subtest.
Also adding support to disbale all crtc to avoid d3 test
failures.
Anshuman Gupta (2):
tests/xe_pm : Add support to disable all crtc
test/xe_pm: Add vram_d3cold_threshold subtest
tests/xe/xe_pm.c | 100 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 100 insertions(+)
--
2.25.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* [igt-dev] [PATCH i-g-t v2 1/2] tests/xe_pm : Add support to disable all crtc
2023-06-28 11:26 [igt-dev] [PATCH i-g-t v2 0/2] vram d3cold threshold test Anshuman Gupta
@ 2023-06-28 11:26 ` Anshuman Gupta
2023-06-28 11:26 ` [igt-dev] [PATCH i-g-t v2 2/2] test/xe_pm: Add vram_d3cold_threshold subtest Anshuman Gupta
2023-06-28 13:58 ` [igt-dev] ✗ Fi.CI.BUILD: failure for vram d3cold threshold test (rev2) Patchwork
2 siblings, 0 replies; 5+ messages in thread
From: Anshuman Gupta @ 2023-06-28 11:26 UTC (permalink / raw)
To: igt-dev; +Cc: badal.nilawar
xe_pm d3 test requires to disable all crtc in order to enter
to d3 state therefore, adding the support to disable all crtc.
Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
---
tests/xe/xe_pm.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/tests/xe/xe_pm.c b/tests/xe/xe_pm.c
index 23b8246ed..c71fce892 100644
--- a/tests/xe/xe_pm.c
+++ b/tests/xe/xe_pm.c
@@ -34,6 +34,7 @@ typedef struct {
int fd_xe;
struct pci_device *pci_xe;
struct pci_device *pci_root;
+ igt_display_t display;
} device_t;
/* runtime_usage is only available if kernel build CONFIG_PM_ADVANCED_DEBUG */
@@ -150,6 +151,23 @@ static bool out_of_d3(device_t device, enum igt_acpi_d_state state)
return true;
}
+static void disable_all_crtc(device_t *device)
+{
+ if (!drmModeGetResources(device->fd_xe))
+ return;
+
+ igt_display_require(&device->display, device->fd_xe);
+ igt_modeset_disable_all_outputs(&device->display);
+}
+
+static void display_fini(device_t *device)
+{
+ if (!drmModeGetResources(device->fd_xe))
+ return;
+
+ igt_display_fini(&device->display);
+}
+
/**
* SUBTEST: %s-basic
* Description: set GPU state to %arg[1] and test suspend/autoresume
@@ -378,6 +396,7 @@ igt_main
get_d3cold_allowed(device.pci_xe, d3cold_allowed);
igt_assert(igt_setup_runtime_pm(device.fd_xe));
+ disable_all_crtc(&device);
}
for (const struct s_state *s = s_states; s->name; s++) {
@@ -438,6 +457,7 @@ igt_main
}
igt_fixture {
+ display_fini(&device);
set_d3cold_allowed(device.pci_xe, d3cold_allowed);
igt_restore_runtime_pm();
xe_device_put(device.fd_xe);
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [igt-dev] [PATCH i-g-t v2 2/2] test/xe_pm: Add vram_d3cold_threshold subtest
2023-06-28 11:26 [igt-dev] [PATCH i-g-t v2 0/2] vram d3cold threshold test Anshuman Gupta
2023-06-28 11:26 ` [igt-dev] [PATCH i-g-t v2 1/2] tests/xe_pm : Add support to disable all crtc Anshuman Gupta
@ 2023-06-28 11:26 ` Anshuman Gupta
2023-07-05 9:19 ` Riana Tauro
2023-06-28 13:58 ` [igt-dev] ✗ Fi.CI.BUILD: failure for vram d3cold threshold test (rev2) Patchwork
2 siblings, 1 reply; 5+ messages in thread
From: Anshuman Gupta @ 2023-06-28 11:26 UTC (permalink / raw)
To: igt-dev; +Cc: badal.nilawar
Adding a vram_d3cold_threshold subtest, which creates a Xe bo and
set the vram_d3cold_threshold according to vram used and bo size.
Test setups the d3cold and expect card to be limited to d3hot.
v2:
- Add subtest doc.
Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
---
tests/xe/xe_pm.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 80 insertions(+)
diff --git a/tests/xe/xe_pm.c b/tests/xe/xe_pm.c
index c71fce892..eaafead23 100644
--- a/tests/xe/xe_pm.c
+++ b/tests/xe/xe_pm.c
@@ -19,6 +19,7 @@
#include "igt.h"
#include "lib/igt_device.h"
#include "lib/igt_pm.h"
+#include "lib/igt_sysfs.h"
#include "lib/igt_syncobj.h"
#include "lib/intel_reg.h"
@@ -30,6 +31,8 @@
#define NO_SUSPEND -1
#define NO_RPM -1
+#define SIZE (4096 * 1024)
+
typedef struct {
int fd_xe;
struct pci_device *pci_xe;
@@ -77,6 +80,22 @@ static void set_d3cold_allowed(struct pci_device *pci,
close(fd);
}
+static void set_vram_d3cold_threshold(int sysfs, uint64_t threshold)
+{
+ char path[64];
+ int ret;
+
+ sprintf(path, "device/vram_d3cold_threshold");
+
+ if (!faccessat(sysfs, path, R_OK | W_OK, 0))
+ ret = igt_sysfs_printf(sysfs, path, "%lu", threshold);
+ else
+ igt_warn("vram_d3cold_threshold is not present\n");
+
+ igt_info("ret value %d", ret);
+ igt_assert(ret > 0);
+}
+
static bool setup_d3(device_t device, enum igt_acpi_d_state state)
{
switch (state) {
@@ -359,6 +378,62 @@ NULL));
igt_assert(in_d3(device, d_state));
}
+/**
+ * SUBTEST: vram_d3cold_threshold
+ * Description:
+ * Validate whether card is limited to d3hot while vram used
+ * is greater than vram_d3cold_threshol_d3cold.
+ * Run type: FULL
+ */
+static void test_vram_d3cold_threshold(device_t device)
+{
+ struct drm_xe_query_mem_usage *mem_usage;
+ struct drm_xe_device_query query = {
+ .extensions = 0,
+ .query = DRM_XE_DEVICE_QUERY_MEM_USAGE,
+ .size = 0,
+ .data = 0,
+ };
+ uint64_t vram_used_mb = 0, vram_total_mb = 0, threshold, mmo;
+ uint32_t bo;
+ void *map;
+ int i, sysfs_fd;
+
+ igt_assert_eq(igt_ioctl(device.fd_xe, DRM_IOCTL_XE_DEVICE_QUERY, &query), 0);
+ igt_assert_neq(query.size, 0);
+
+ mem_usage = malloc(query.size);
+ igt_assert(mem_usage);
+
+ query.data = to_user_pointer(mem_usage);
+ igt_assert_eq(igt_ioctl(device.fd_xe, DRM_IOCTL_XE_DEVICE_QUERY, &query), 0);
+
+ for (i = 0; i < mem_usage->num_regions; i++) {
+ if (mem_usage->regions[i].mem_class == XE_MEM_REGION_CLASS_VRAM) {
+ vram_used_mb += (mem_usage->regions[i].used / (1024 * 1024));
+ vram_total_mb += (mem_usage->regions[i].total_size / (1024 * 1024));
+ }
+ }
+
+ bo = xe_bo_create_flags(device.fd_xe, 0, SIZE, vram_memory(device.fd_xe, 0));
+ mmo = xe_bo_mmap_offset(device.fd_xe, bo);
+ map = mmap(NULL, SIZE, PROT_WRITE, MAP_SHARED, device.fd_xe, mmo);
+ igt_assert(map != MAP_FAILED);
+
+ memset(map, 0, SIZE);
+ munmap(map, SIZE);
+ threshold = vram_used_mb + (SIZE / (1024 * 1024));
+ igt_require(threshold < vram_total_mb);
+ sysfs_fd = igt_sysfs_open(device.fd_xe);
+ set_vram_d3cold_threshold(sysfs_fd, threshold);
+ close(sysfs_fd);
+
+ /* Setup D3Cold but card should be in D0 */
+ igt_assert(setup_d3(device, IGT_ACPI_D3Cold));
+ igt_assert(in_d3(device, IGT_ACPI_D3Hot));
+ igt_assert(out_of_d3(device, IGT_ACPI_D3Cold));
+}
+
igt_main
{
struct drm_xe_engine_class_instance *hwe;
@@ -456,6 +531,11 @@ igt_main
}
}
+ igt_describe("Validate whether card is limited to d3hot, if vram used > vram threshold");
+ igt_subtest("vram-d3cold-threshold") {
+ test_vram_d3cold_threshold(device);
+ }
+
igt_fixture {
display_fini(&device);
set_d3cold_allowed(device.pci_xe, d3cold_allowed);
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [igt-dev] ✗ Fi.CI.BUILD: failure for vram d3cold threshold test (rev2)
2023-06-28 11:26 [igt-dev] [PATCH i-g-t v2 0/2] vram d3cold threshold test Anshuman Gupta
2023-06-28 11:26 ` [igt-dev] [PATCH i-g-t v2 1/2] tests/xe_pm : Add support to disable all crtc Anshuman Gupta
2023-06-28 11:26 ` [igt-dev] [PATCH i-g-t v2 2/2] test/xe_pm: Add vram_d3cold_threshold subtest Anshuman Gupta
@ 2023-06-28 13:58 ` Patchwork
2 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2023-06-28 13:58 UTC (permalink / raw)
To: Anshuman Gupta; +Cc: igt-dev
== Series Details ==
Series: vram d3cold threshold test (rev2)
URL : https://patchwork.freedesktop.org/series/119914/
State : failure
== Summary ==
IGT patchset build failed on latest successful build
07fe9ec40f779a788946ad371b0b683cab3c2536 Update MAINTAINERS
ninja: Entering directory `/opt/igt/build'
[1/443] Generating version.h with a custom command.
[2/5] Generating xe_tests.rst with a custom command.
FAILED: docs/testplan/xe_tests.rst
/usr/src/igt-gpu-tools/scripts/igt_doc.py --config /usr/src/igt-gpu-tools/tests/xe/xe_test_config.json --rest docs/testplan/xe_tests.rst --check-testlist --igt-build-path /opt/igt/build
Warning: Missing documentation for igt@xe_pm@vram-d3cold-threshold
ninja: build stopped: subcommand failed.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [igt-dev] [PATCH i-g-t v2 2/2] test/xe_pm: Add vram_d3cold_threshold subtest
2023-06-28 11:26 ` [igt-dev] [PATCH i-g-t v2 2/2] test/xe_pm: Add vram_d3cold_threshold subtest Anshuman Gupta
@ 2023-07-05 9:19 ` Riana Tauro
0 siblings, 0 replies; 5+ messages in thread
From: Riana Tauro @ 2023-07-05 9:19 UTC (permalink / raw)
To: Anshuman Gupta, igt-dev; +Cc: badal.nilawar
Hi Anshuman
On 6/28/2023 4:56 PM, Anshuman Gupta wrote:
> Adding a vram_d3cold_threshold subtest, which creates a Xe bo and
> set the vram_d3cold_threshold according to vram used and bo size.
> Test setups the d3cold and expect card to be limited to d3hot.
>
> v2:
> - Add subtest doc.
>
> Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
> ---
> tests/xe/xe_pm.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 80 insertions(+)
>
> diff --git a/tests/xe/xe_pm.c b/tests/xe/xe_pm.c
> index c71fce892..eaafead23 100644
> --- a/tests/xe/xe_pm.c
> +++ b/tests/xe/xe_pm.c
> @@ -19,6 +19,7 @@
> #include "igt.h"
> #include "lib/igt_device.h"
> #include "lib/igt_pm.h"
> +#include "lib/igt_sysfs.h"
> #include "lib/igt_syncobj.h"
> #include "lib/intel_reg.h"
>
> @@ -30,6 +31,8 @@
> #define NO_SUSPEND -1
> #define NO_RPM -1
>
> +#define SIZE (4096 * 1024)
> +
> typedef struct {
> int fd_xe;
> struct pci_device *pci_xe;
> @@ -77,6 +80,22 @@ static void set_d3cold_allowed(struct pci_device *pci,
> close(fd);
> }
>
> +static void set_vram_d3cold_threshold(int sysfs, uint64_t threshold)
> +{
> + char path[64];
> + int ret;
> +
> + sprintf(path, "device/vram_d3cold_threshold");
> +
> + if (!faccessat(sysfs, path, R_OK | W_OK, 0))
> + ret = igt_sysfs_printf(sysfs, path, "%lu", threshold);
> + else
> + igt_warn("vram_d3cold_threshold is not present\n");
> +
> + igt_info("ret value %d", ret);
> + igt_assert(ret > 0);
> +}
> +
> static bool setup_d3(device_t device, enum igt_acpi_d_state state)
> {
> switch (state) {
> @@ -359,6 +378,62 @@ NULL));
> igt_assert(in_d3(device, d_state));
> }
>
> +/**
> + * SUBTEST: vram_d3cold_threshold
Subtest: vram-d3cold-threshold
> + * Description:
> + * Validate whether card is limited to d3hot while vram used
> + * is greater than vram_d3cold_threshol_d3cold.
s/vram_d3cold_threshol_d3cold/vram_d3cold_threshold
> + * Run type: FULL
> + */
> +static void test_vram_d3cold_threshold(device_t device)
> +{
> + struct drm_xe_query_mem_usage *mem_usage;
> + struct drm_xe_device_query query = {
> + .extensions = 0,
> + .query = DRM_XE_DEVICE_QUERY_MEM_USAGE,
> + .size = 0,
> + .data = 0,
> + };
> + uint64_t vram_used_mb = 0, vram_total_mb = 0, threshold, mmo;
> + uint32_t bo;
> + void *map;
> + int i, sysfs_fd;
> +
> + igt_assert_eq(igt_ioctl(device.fd_xe, DRM_IOCTL_XE_DEVICE_QUERY, &query), 0);
> + igt_assert_neq(query.size, 0);
> +
> + mem_usage = malloc(query.size);
> + igt_assert(mem_usage);
> +
> + query.data = to_user_pointer(mem_usage);
> + igt_assert_eq(igt_ioctl(device.fd_xe, DRM_IOCTL_XE_DEVICE_QUERY, &query), 0);
> +
> + for (i = 0; i < mem_usage->num_regions; i++) {
> + if (mem_usage->regions[i].mem_class == XE_MEM_REGION_CLASS_VRAM) {
> + vram_used_mb += (mem_usage->regions[i].used / (1024 * 1024));
> + vram_total_mb += (mem_usage->regions[i].total_size / (1024 * 1024));
> + }
> + }
> +
> + bo = xe_bo_create_flags(device.fd_xe, 0, SIZE, vram_memory(device.fd_xe, 0));
It will fail on assert of ioctl if vram is not present. Should this test
be skipped if !xe_has_vram
> + mmo = xe_bo_mmap_offset(device.fd_xe, bo);
> + map = mmap(NULL, SIZE, PROT_WRITE, MAP_SHARED, device.fd_xe, mmo);
> + igt_assert(map != MAP_FAILED);
Replace with xe_bo_map call
> +
> + memset(map, 0, SIZE);
> + munmap(map, SIZE);
> + threshold = vram_used_mb + (SIZE / (1024 * 1024));threshold should be set to vram_used_mb
> + igt_require(threshold < vram_total_mb); > + sysfs_fd = igt_sysfs_open(device.fd_xe);
> + set_vram_d3cold_threshold(sysfs_fd, threshold);
> + close(sysfs_fd);
> +
> + /* Setup D3Cold but card should be in D0 */
s/D0/D3hot
> + igt_assert(setup_d3(device, IGT_ACPI_D3Cold));
> + igt_assert(in_d3(device, IGT_ACPI_D3Hot));
> + igt_assert(out_of_d3(device, IGT_ACPI_D3Cold));
Release
gem_close(fd, bo);
Thanks
Riana
> +}
> +
> igt_main
> {
> struct drm_xe_engine_class_instance *hwe;
> @@ -456,6 +531,11 @@ igt_main
> }
> }
>
> + igt_describe("Validate whether card is limited to d3hot, if vram used > vram threshold");
> + igt_subtest("vram-d3cold-threshold") {
> + test_vram_d3cold_threshold(device);
> + }
> +
> igt_fixture {
> display_fini(&device);
> set_d3cold_allowed(device.pci_xe, d3cold_allowed);
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-07-05 9:20 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-06-28 11:26 [igt-dev] [PATCH i-g-t v2 0/2] vram d3cold threshold test Anshuman Gupta
2023-06-28 11:26 ` [igt-dev] [PATCH i-g-t v2 1/2] tests/xe_pm : Add support to disable all crtc Anshuman Gupta
2023-06-28 11:26 ` [igt-dev] [PATCH i-g-t v2 2/2] test/xe_pm: Add vram_d3cold_threshold subtest Anshuman Gupta
2023-07-05 9:19 ` Riana Tauro
2023-06-28 13:58 ` [igt-dev] ✗ Fi.CI.BUILD: failure for vram d3cold threshold test (rev2) Patchwork
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox