From 46b97da60bca9de4f6f2353870c9a1c543182b0c Mon Sep 17 00:00:00 2001 From: Icenowy Zheng Date: Thu, 4 Dec 2025 00:28:37 +0800 Subject: [PATCH] pvr: fix PVR_DEBUG=info when running w/o KHR_display When running w/o KHR_display enabled, the display device node won't be initlaized, and the information dump routine will terminate because of this. Fix this by not bailing out and not trying to print display device compatible strings. Fixes: 8825c91dcb84 ("pvr: Make display node optional") Signed-off-by: Icenowy Zheng Reviewed-by: Frank Binns Part-of: --- src/imagination/common/pvr_dump_info.c | 10 ++++++---- src/imagination/vulkan/pvr_physical_device.c | 3 --- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/imagination/common/pvr_dump_info.c b/src/imagination/common/pvr_dump_info.c index d374b85561d..586c64da3dd 100644 --- a/src/imagination/common/pvr_dump_info.c +++ b/src/imagination/common/pvr_dump_info.c @@ -111,10 +111,12 @@ void pvr_dump_physical_device_info(const struct pvr_device_dump_info *dump_info) pvr_dump_field_string(&ctx, "MESA ", PACKAGE_VERSION MESA_GIT_SHA1); pvr_dump_dedent(&ctx); - pvr_dump_mark_section(&ctx, "Display Platform Compatible Strings"); - pvr_dump_indent(&ctx); - pvr_dump_field_compatible_strings(&ctx, dump_info->drm_display.comp); - pvr_dump_dedent(&ctx); + if (dump_info->drm_display.comp) { + pvr_dump_mark_section(&ctx, "Display Platform Compatible Strings"); + pvr_dump_indent(&ctx); + pvr_dump_field_compatible_strings(&ctx, dump_info->drm_display.comp); + pvr_dump_dedent(&ctx); + } pvr_dump_mark_section(&ctx, "Render Platform Compatible Strings"); pvr_dump_indent(&ctx); diff --git a/src/imagination/vulkan/pvr_physical_device.c b/src/imagination/vulkan/pvr_physical_device.c index c9444e49f7b..7279b0c6fbc 100644 --- a/src/imagination/vulkan/pvr_physical_device.c +++ b/src/imagination/vulkan/pvr_physical_device.c @@ -46,9 +46,6 @@ pvr_physical_device_dump_info(const struct pvr_physical_device *pdevice, if (pdevice->ws->display_fd >= 0) version_display = drmGetVersion(pdevice->ws->display_fd); - if (!version_display) - return; - version_render = drmGetVersion(pdevice->ws->render_fd); if (!version_render) { drmFreeVersion(version_display);