fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 05:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

venus: virtgpu: Require stable wire format
Some checks are pending
macOS-CI / macOS-CI (dri) (push) Waiting to run
Details
macOS-CI / macOS-CI (xlib) (push) Waiting to run
Details

Browse source 
When VMMs do not support VIRTGPU_DRM_CAPSET_VENUS the capset data
remains zeroed. By requiring the stable wire_format_version 1 this can
be detected early without initialising the renderer.

Avoids triggering `assert(capset->supports_blob_id_0);` in debug builds
under such circumstances.

Cc: mesa-stable
Signed-off-by: Janne Grunau <j@jannau.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34613>
(cherry picked from commit 3d3ca9b65e)
This commit is contained in:
Janne Grunau 2025-04-18 18:52:25 +02:00 • committed by Eric Engestrom
parent a4ae9c2143
commit b734cf734e
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -944,7 +944,7 @@
"description": "venus: virtgpu: Require stable wire format",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

8
src/virtio/vulkan/vn_renderer_virtgpu.c
View file

@ -1490,6 +1490,14 @@ virtgpu_init_capset(struct virtgpu *gpu)
return VK_ERROR_INITIALIZATION_FAILED;
}
if (gpu->capset.data.wire_format_version == 0) {
if (VN_DEBUG(INIT)) {
vn_log(gpu->instance, "Unsupported wire format version %u",
gpu->capset.data.wire_format_version);
}
return VK_ERROR_INITIALIZATION_FAILED;
}
return VK_SUCCESS;
}