mirrors/mesa
0
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2024-11-23 10:14:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

virgl/vtest: When trying to use protocol 3 check host feature

Browse Source 
Protocol version 3 used host side resource IDs that may be reused.
Because with older host versions index-buffer binding may go wrong
in this case, we have to check whether the host vrend version is
actually ready for protocol version 3, and if not we re-negotiate
the protocol version only allowing up to version 2.

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31624>
This commit is contained in:
Gert Wollny 2024-10-15 22:04:38 +02:00 committed by Marge Bot
parent 4e3f21533a
commit a32de23a9d
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/gallium/winsys/virgl/vtest/virgl_vtest_socket.c
View File

@ -143,7 +143,7 @@ static int virgl_vtest_send_init(struct virgl_vtest_winsys *vws)
return 0;
}
static int virgl_vtest_negotiate_version(struct virgl_vtest_winsys *vws)
static int virgl_vtest_negotiate_version(struct virgl_vtest_winsys *vws, int version)
{
uint32_t vtest_hdr[VTEST_HDR_SIZE];
uint32_t version_buf[VCMD_PROTOCOL_VERSION_SIZE];
@ -174,7 +174,7 @@ static int virgl_vtest_negotiate_version(struct virgl_vtest_winsys *vws)
vtest_hdr[VTEST_CMD_LEN] = VCMD_PROTOCOL_VERSION_SIZE;
vtest_hdr[VTEST_CMD_ID] = VCMD_PROTOCOL_VERSION;
version_buf[VCMD_PROTOCOL_VERSION_VERSION] = VTEST_PROTOCOL_VERSION;
version_buf[VCMD_PROTOCOL_VERSION_VERSION] = version;
virgl_block_write(vws->sock_fd, &vtest_hdr, sizeof(vtest_hdr));
virgl_block_write(vws->sock_fd, &version_buf, sizeof(version_buf));
@ -218,7 +218,7 @@ int virgl_vtest_connect(struct virgl_vtest_winsys *vws)
vws->sock_fd = sock;
virgl_vtest_send_init(vws);
vws->protocol_version = virgl_vtest_negotiate_version(vws);
vws->protocol_version = virgl_vtest_negotiate_version(vws, VTEST_PROTOCOL_VERSION);
/* Version 1 is deprecated. */
if (vws->protocol_version == 1)
@ -272,6 +272,14 @@ int virgl_vtest_send_get_caps(struct virgl_vtest_winsys *vws,
} else
ret = virgl_block_read(vws->sock_fd, &caps->caps, sizeof(struct virgl_caps_v1));
// Old virglrenderer versions can't handle the re-use of host-generated
// resource IDs that are used with protocol version 3, so re-negotiate the
// protocol version limiting to <= 2
if (vws->protocol_version > 2 &&
caps->caps.v2.host_feature_check_version < 23) {
vws->protocol_version = virgl_vtest_negotiate_version(vws, 2);
}
return 0;
}