[igt-dev] [PATCH RFC 1/2] lib/igt_core: add a logic to store a GPU string
Mauro Carvalho Chehab
mauro.chehab at linux.intel.com
Wed Sep 28 08:58:41 UTC 2022
From: Mauro Carvalho Chehab <mchehab at kernel.org>
This is helpful on tests that run with multiple GPUs.
Signed-off-by: Mauro Carvalho Chehab <mchehab at kernel.org>
---
lib/drmtest.c | 4 +++-
lib/igt_core.c | 24 ++++++++++++++++++++++++
lib/igt_core.h | 6 ++++++
3 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/lib/drmtest.c b/lib/drmtest.c
index 16e80bdfcfb1..5eb9827278c8 100644
--- a/lib/drmtest.c
+++ b/lib/drmtest.c
@@ -222,8 +222,10 @@ static int open_device(const char *name, unsigned int chipset)
break;
}
}
- if ((chipset & chip) == chip)
+ if ((chipset & chip) == chip) {
+ set_gpu_string(name);
return fd;
+ }
err:
close(fd);
diff --git a/lib/igt_core.c b/lib/igt_core.c
index e7425326b7f0..0d018758ce38 100644
--- a/lib/igt_core.c
+++ b/lib/igt_core.c
@@ -1447,6 +1447,30 @@ bool __igt_enter_dynamic_container(void)
return true;
}
+static __thread char *gpu_string = NULL;
+
+void set_gpu_string(const char *fname)
+{
+ char sysfs[PATH_MAX], *path, *p;
+
+
+ p = strrchr(fname, '/');
+ if (!p) {
+ path = strdup(fname);
+ } else {
+ p++;
+
+ strcpy(sysfs, "/sys/class/drm/");
+ strcat(sysfs, p);
+ path = realpath(sysfs, NULL);
+ }
+
+ if (gpu_string)
+ free(gpu_string);
+ gpu_string = path;
+ igt_assert(gpu_string);
+}
+
__noreturn static void exit_subtest(const char *result)
{
struct timespec now;
diff --git a/lib/igt_core.h b/lib/igt_core.h
index aa98e8ed8deb..62e7065429c9 100644
--- a/lib/igt_core.h
+++ b/lib/igt_core.h
@@ -1490,4 +1490,10 @@ static inline void igt_pci_system_cleanup(void)
{
}
+/**
+ * set_gpu_string():
+ * Sets a string to describe the GPU being tested
+ */
+void set_gpu_string(const char *string);
+
#endif /* IGT_CORE_H */
--
2.37.3
More information about the igt-dev
mailing list