fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 11:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

pvr: fix PVR_DEBUG=info when running w/o KHR_display

Browse source 
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: 8825c91dcb ("pvr: Make display node optional")
Signed-off-by: Icenowy Zheng <uwu@icenowy.me>
Reviewed-by: Frank Binns <frank.binns@imgtec.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38787>
This commit is contained in:
Icenowy Zheng 2025-12-04 00:28:37 +08:00 • committed by Marge Bot
parent a372d39609
commit 46b97da60b
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/imagination/common/pvr_dump_info.c
View file

@ -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);

3
src/imagination/vulkan/pvr_physical_device.c
View file

@ -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);