From 0e5b5c5050a25a9ce09f1751d1522e11e8dae16b Mon Sep 17 00:00:00 2001 From: Tvrtko Ursulin Date: Mon, 23 May 2022 13:22:44 +0100 Subject: intel_gpu_top: Don't show client header if no kernel support On kernels without support for the feature we should skip showing the clients header to avoid confusing users. Simply briefly open a render node to the selected device during init and look if the relevant fields are present in the fdinfo data. Signed-off-by: Tvrtko Ursulin Issue: https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/issues/120 Reviewed-by: Petri Latvala --- tools/intel_gpu_top.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/intel_gpu_top.c b/tools/intel_gpu_top.c index 1984c10d..26986a82 100644 --- a/tools/intel_gpu_top.c +++ b/tools/intel_gpu_top.c @@ -2389,6 +2389,23 @@ static void process_stdin(unsigned int timeout_us) process_normal_stdin(); } +static bool has_drm_fdinfo(const struct igt_device_card *card) +{ + struct drm_client_fdinfo info; + unsigned int cnt; + int fd; + + fd = open(card->render, O_RDWR); + if (fd < 0) + return false; + + cnt = igt_parse_drm_fdinfo(fd, &info); + + close(fd); + + return cnt > 0; +} + static void show_help_screen(void) { printf( @@ -2545,8 +2562,9 @@ int main(int argc, char **argv) ret = EXIT_SUCCESS; - clients = init_clients(card.pci_slot_name[0] ? - card.pci_slot_name : IGPU_PCI); + if (has_drm_fdinfo(&card)) + clients = init_clients(card.pci_slot_name[0] ? + card.pci_slot_name : IGPU_PCI); init_engine_classes(engines); if (clients) { clients->num_classes = engines->num_classes; -- cgit v1.2.3