Igt-dev Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Mauro Carvalho Chehab <mauro.chehab@linux.intel.com>
To: igt-dev@lists.freedesktop.org
Subject: [igt-dev] [PATCH RFC 1/2] lib/igt_core: add a logic to store a GPU string
Date: Wed, 28 Sep 2022 10:58:41 +0200	[thread overview]
Message-ID: <20220928085842.34107-2-mauro.chehab@linux.intel.com> (raw)
In-Reply-To: <20220928085842.34107-1-mauro.chehab@linux.intel.com>

From: Mauro Carvalho Chehab <mchehab@kernel.org>

This is helpful on tests that run with multiple GPUs.

Signed-off-by: Mauro Carvalho Chehab <mchehab@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

  reply	other threads:[~2022-09-28  8:59 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-28  8:58 [igt-dev] [PATCH RFC 0/2] add sysfs node at subtest results when available Mauro Carvalho Chehab
2022-09-28  8:58 ` Mauro Carvalho Chehab [this message]
2022-09-28  8:58 ` [igt-dev] [PATCH RFC 2/2] lib/igt_core: print card sysfs node at subtest results Mauro Carvalho Chehab
     [not found]   ` <YzQXFRYCk8Alj4zR@platvala-desk.ger.corp.intel.com>
     [not found]     ` <YzR1ypRVkKtVXt22@kamilkon-desk1>
2022-09-29  8:21       ` Mauro Carvalho Chehab
     [not found]         ` <YzVuHIriXmCIbiVT@platvala-desk.ger.corp.intel.com>
2022-09-29 12:56           ` Mauro Carvalho Chehab

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=20220928085842.34107-2-mauro.chehab@linux.intel.com \
    --to=mauro.chehab@linux.intel.com \
    --cc=igt-dev@lists.freedesktop.org \
    /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