[igt-dev] [PATCH i-g-t 08/12] lib/igt_drm_clients: Fix client id type confusion
Tvrtko Ursulin
tvrtko.ursulin at linux.intel.com
Fri Sep 29 12:25:13 UTC 2023
From: Tvrtko Ursulin <tvrtko.ursulin at 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 at 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 739ed9839961..35c125f22c48 100644
--- a/tools/intel_gpu_top.c
+++ b/tools/intel_gpu_top.c
@@ -2102,7 +2102,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
More information about the igt-dev
mailing list