From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
To: igt-dev@lists.freedesktop.org, Intel-gfx@lists.freedesktop.org
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Subject: [igt-dev] [PATCH i-g-t 5/9] lib/igt_drm_clients: Fix client id type confusion
Date: Thu, 12 Oct 2023 09:15:43 +0100 [thread overview]
Message-ID: <20231012081547.852052-6-tvrtko.ursulin@linux.intel.com> (raw)
In-Reply-To: <20231012081547.852052-1-tvrtko.ursulin@linux.intel.com>
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Igt_drm_fdinfo defines it as an unsigned long so it is best that it
matches here as well.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
lib/igt_drm_clients.c | 2 +-
lib/igt_drm_clients.h | 2 +-
tools/intel_gpu_top.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/igt_drm_clients.c b/lib/igt_drm_clients.c
index 47ad137d5f1f..da51d7335b2b 100644
--- a/lib/igt_drm_clients.c
+++ b/lib/igt_drm_clients.c
@@ -49,7 +49,7 @@ struct igt_drm_clients *igt_drm_clients_init(void *private_data)
static struct igt_drm_client *
igt_drm_clients_find(struct igt_drm_clients *clients,
enum igt_drm_client_status status,
- unsigned int drm_minor, unsigned int id)
+ unsigned int drm_minor, unsigned long id)
{
unsigned int start, num;
struct igt_drm_client *c;
diff --git a/lib/igt_drm_clients.h b/lib/igt_drm_clients.h
index 07bd236d43bf..cd37f8508b20 100644
--- a/lib/igt_drm_clients.h
+++ b/lib/igt_drm_clients.h
@@ -56,7 +56,7 @@ struct igt_drm_client {
enum igt_drm_client_status status;
struct igt_drm_client_regions *regions; /* Memory regions present in this client, to map with memory usage. */
struct igt_drm_client_engines *engines; /* Engines used by this client, to map with busynees data. */
- unsigned int id; /* DRM client id from fdinfo. */
+ unsigned long id; /* DRM client id from fdinfo. */
unsigned int drm_minor; /* DRM minor of this client. */
unsigned int pid; /* PID which has this DRM fd open. */
char pid_str[10]; /* Cached PID representation. */
diff --git a/tools/intel_gpu_top.c b/tools/intel_gpu_top.c
index 00506c63db4e..34fa99235e11 100644
--- a/tools/intel_gpu_top.c
+++ b/tools/intel_gpu_top.c
@@ -2106,7 +2106,7 @@ print_client(struct igt_drm_client *c, struct engines *engines, double t, int li
} else if (output_mode == JSON) {
char buf[64];
- snprintf(buf, sizeof(buf), "%u", c->id);
+ snprintf(buf, sizeof(buf), "%lu", c->id);
pops->open_struct(buf);
__json_add_member("name", c->print_name);
--
2.39.2
next prev parent reply other threads:[~2023-10-12 8:15 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-12 8:15 [igt-dev] [PATCH i-g-t 0/9] Client memory fdinfo test and intel_gpu_top support Tvrtko Ursulin
2023-10-12 8:15 ` [igt-dev] [PATCH i-g-t 1/9] tests/i915/drm_fdinfo: Check engine info is supported Tvrtko Ursulin
2023-11-03 18:21 ` [igt-dev] [Intel-gfx] " Kamil Konieczny
2023-10-12 8:15 ` [igt-dev] [PATCH i-g-t 2/9] tests/i915/drm_fdinfo: Stress test context close versus fdinfo reads Tvrtko Ursulin
2023-11-03 18:32 ` [igt-dev] [Intel-gfx] " Kamil Konieczny
2023-11-06 12:38 ` Tvrtko Ursulin
2023-10-12 8:15 ` [igt-dev] [PATCH i-g-t 3/9] tests/i915/drm_fdinfo: Add some memory info tests Tvrtko Ursulin
2023-11-03 19:05 ` [igt-dev] [Intel-gfx] " Kamil Konieczny
2023-10-12 8:15 ` [igt-dev] [PATCH i-g-t 4/9] lib/igt_drm_fdinfo: Copy over region map name on match Tvrtko Ursulin
2023-11-03 18:56 ` Kamil Konieczny
2023-10-12 8:15 ` Tvrtko Ursulin [this message]
2023-11-03 18:54 ` [igt-dev] [Intel-gfx] [PATCH i-g-t 5/9] lib/igt_drm_clients: Fix client id type confusion Kamil Konieczny
2023-10-12 8:15 ` [igt-dev] [PATCH i-g-t 6/9] lib/igt_drm_clients: Allow passing in the memory region map Tvrtko Ursulin
2023-11-03 18:47 ` [igt-dev] [Intel-gfx] " Kamil Konieczny
2023-10-12 8:15 ` [igt-dev] [PATCH i-g-t 7/9] tools/intel_gpu_top: Fully wrap clients operations Tvrtko Ursulin
2023-11-03 18:57 ` Kamil Konieczny
2023-10-12 8:15 ` [igt-dev] [PATCH i-g-t 8/9] tools/intel_gpu_top: Add per client memory info Tvrtko Ursulin
2023-11-03 19:01 ` Kamil Konieczny
2023-10-12 8:15 ` [igt-dev] [PATCH i-g-t 9/9] tools/intel_gpu_top: Add ability to show memory region breakdown Tvrtko Ursulin
2023-11-03 19:04 ` Kamil Konieczny
2023-10-12 15:25 ` [igt-dev] ✓ Fi.CI.BAT: success for Client memory fdinfo test and intel_gpu_top support (rev2) Patchwork
2023-10-12 15:29 ` [igt-dev] ✓ CI.xeBAT: " Patchwork
2023-10-13 13:18 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
2023-11-06 12:41 ` Kamil Konieczny
2023-11-07 12:59 ` Illipilli, TejasreeX
2023-11-07 12:28 ` [igt-dev] ✓ Fi.CI.IGT: success " Patchwork
2023-11-07 12:36 ` 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=20231012081547.852052-6-tvrtko.ursulin@linux.intel.com \
--to=tvrtko.ursulin@linux.intel.com \
--cc=Intel-gfx@lists.freedesktop.org \
--cc=igt-dev@lists.freedesktop.org \
--cc=tvrtko.ursulin@intel.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