From a7272a6f245b9c30d215d58ff948cdfb294f3e28 Mon Sep 17 00:00:00 2001 From: Antonio Gomes Date: Fri, 10 Nov 2023 23:38:25 -0300 Subject: [PATCH] mesa/st: Skip querying PCI values in interop_query_device_info if version >= 4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Karol Herbst Reviewed-by: Marek Olšák Part-of: --- include/GL/mesa_glinterop.h | 2 +- src/mesa/state_tracker/st_interop.c | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/include/GL/mesa_glinterop.h b/include/GL/mesa_glinterop.h index 2c3b993183b..89c42c0e180 100644 --- a/include/GL/mesa_glinterop.h +++ b/include/GL/mesa_glinterop.h @@ -101,7 +101,7 @@ enum { MESA_GLINTEROP_ACCESS_WRITE_ONLY }; -#define MESA_GLINTEROP_DEVICE_INFO_VERSION 3 +#define MESA_GLINTEROP_DEVICE_INFO_VERSION 4 #define UUID_SIZE 16 diff --git a/src/mesa/state_tracker/st_interop.c b/src/mesa/state_tracker/st_interop.c index 8b7c7afaef3..57257a56149 100644 --- a/src/mesa/state_tracker/st_interop.c +++ b/src/mesa/state_tracker/st_interop.c @@ -43,10 +43,13 @@ st_interop_query_device_info(struct st_context *st, if (out->version == 0) return MESA_GLINTEROP_INVALID_VERSION; - out->pci_segment_group = screen->get_param(screen, PIPE_CAP_PCI_GROUP); - out->pci_bus = screen->get_param(screen, PIPE_CAP_PCI_BUS); - out->pci_device = screen->get_param(screen, PIPE_CAP_PCI_DEVICE); - out->pci_function = screen->get_param(screen, PIPE_CAP_PCI_FUNCTION); + /* PCI values are obsolete on version >= 4 of the interface */ + if (out->version < 4) { + out->pci_segment_group = screen->get_param(screen, PIPE_CAP_PCI_GROUP); + out->pci_bus = screen->get_param(screen, PIPE_CAP_PCI_BUS); + out->pci_device = screen->get_param(screen, PIPE_CAP_PCI_DEVICE); + out->pci_function = screen->get_param(screen, PIPE_CAP_PCI_FUNCTION); + } out->vendor_id = screen->get_param(screen, PIPE_CAP_VENDOR_ID); out->device_id = screen->get_param(screen, PIPE_CAP_DEVICE_ID); @@ -59,8 +62,8 @@ st_interop_query_device_info(struct st_context *st, if (out->version >= 3 && screen->get_device_uuid) screen->get_device_uuid(screen, out->device_uuid); - /* Instruct the caller that we support up-to version three of the interface */ - out->version = MIN2(out->version, 3); + /* Instruct the caller that we support up-to version four of the interface */ + out->version = MIN2(out->version, 4); return MESA_GLINTEROP_SUCCESS; }