From 488b2d4d253bc988184b0fdecd337706e5449f95 Mon Sep 17 00:00:00 2001
From: Yiwei Zhang <zzyiwei@chromium.org>
Date: Thu, 20 Mar 2025 15:47:11 -0700
Subject: [PATCH] virgl/venus/vtest: align capset and protocol with
 virglrenderer

Virgl and venus capsets along with vtest protocol v3 are all stable now.
This change is to align with:
https://gitlab.freedesktop.org/virgl/virglrenderer/-/merge_requests/1311

Acked-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Acked-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34135>
---
 src/asahi/lib/agx_device_virtio.c                   |  1 -
 src/gallium/winsys/virgl/vtest/virgl_vtest_socket.c |  2 --
 src/virtio/virtio-gpu/venus_hw.h                    |  2 --
 src/virtio/vtest/vtest_protocol.h                   | 10 ----------
 src/virtio/vulkan/vn_renderer_virtgpu.c             |  1 -
 src/virtio/vulkan/vn_renderer_vtest.c               |  1 -
 6 files changed, 17 deletions(-)

diff --git a/src/asahi/lib/agx_device_virtio.c b/src/asahi/lib/agx_device_virtio.c
index 245d31b508d..40e286aa4de 100644
--- a/src/asahi/lib/agx_device_virtio.c
+++ b/src/asahi/lib/agx_device_virtio.c
@@ -11,7 +11,6 @@
 #include "drm-uapi/virtgpu_drm.h"
 #include "unstable_asahi_drm.h"
 
-#define VIRGL_RENDERER_UNSTABLE_APIS 1
 #include "vdrm.h"
 #include "virglrenderer_hw.h"
 
diff --git a/src/gallium/winsys/virgl/vtest/virgl_vtest_socket.c b/src/gallium/winsys/virgl/vtest/virgl_vtest_socket.c
index 4a0dfd20aea..1f13943cd06 100644
--- a/src/gallium/winsys/virgl/vtest/virgl_vtest_socket.c
+++ b/src/gallium/winsys/virgl/vtest/virgl_vtest_socket.c
@@ -31,8 +31,6 @@
 #include <util/format/u_format.h>
 #include <util/u_process.h>
 
-#define VIRGL_RENDERER_UNSTABLE_APIS
-
 #include "virgl_vtest_winsys.h"
 #include "virgl_vtest_public.h"
 
diff --git a/src/virtio/virtio-gpu/venus_hw.h b/src/virtio/virtio-gpu/venus_hw.h
index 66b1007597d..3ef774b8259 100644
--- a/src/virtio/virtio-gpu/venus_hw.h
+++ b/src/virtio/virtio-gpu/venus_hw.h
@@ -26,7 +26,6 @@
 
 #include <stdint.h>
 
-#ifdef VIRGL_RENDERER_UNSTABLE_APIS
 struct virgl_renderer_capset_venus {
    uint32_t wire_format_version;
    uint32_t vk_xml_version;
@@ -71,6 +70,5 @@ struct virgl_renderer_capset_venus {
     */
    uint32_t use_guest_vram;
 };
-#endif
 
 #endif /* VENUS_HW_H */
diff --git a/src/virtio/vtest/vtest_protocol.h b/src/virtio/vtest/vtest_protocol.h
index c48be146ec5..0869f0d18e7 100644
--- a/src/virtio/vtest/vtest_protocol.h
+++ b/src/virtio/vtest/vtest_protocol.h
@@ -27,11 +27,7 @@
 
 #define VTEST_DEFAULT_SOCKET_NAME "/tmp/.virgl_test"
 
-#ifdef VIRGL_RENDERER_UNSTABLE_APIS
 #define VTEST_PROTOCOL_VERSION 3
-#else
-#define VTEST_PROTOCOL_VERSION 2
-#endif
 
 /* 32-bit length field */
 /* 32-bit cmd field */
@@ -70,7 +66,6 @@
 #define VCMD_TRANSFER_GET2 13
 #define VCMD_TRANSFER_PUT2 14
 
-#ifdef VIRGL_RENDERER_UNSTABLE_APIS
 /* since protocol version 3 */
 #define VCMD_GET_PARAM 15
 #define VCMD_GET_CAPSET 16
@@ -82,7 +77,6 @@
 #define VCMD_SYNC_WRITE 22
 #define VCMD_SYNC_WAIT 23
 #define VCMD_SUBMIT_CMD2 24
-#endif /* VIRGL_RENDERER_UNSTABLE_APIS */
 
 #define VCMD_RES_CREATE_SIZE 10
 #define VCMD_RES_CREATE_RES_HANDLE 0 /* must be 0 since protocol version 3 */
@@ -150,8 +144,6 @@
 #define VCMD_PROTOCOL_VERSION_SIZE 1
 #define VCMD_PROTOCOL_VERSION_VERSION 0
 
-#ifdef VIRGL_RENDERER_UNSTABLE_APIS
-
 enum vcmd_param  {
    VCMD_PARAM_MAX_TIMELINE_COUNT = 1,
 };
@@ -241,6 +233,4 @@ struct vcmd_submit_cmd2_batch {
 #define VCMD_SUBMIT_CMD2_BATCH_SYNC_COUNT(n)       (1 + 8 * (n) + 4)
 #define VCMD_SUBMIT_CMD2_BATCH_RING_IDX(n)         (1 + 8 * (n) + 5)
 
-#endif /* VIRGL_RENDERER_UNSTABLE_APIS */
-
 #endif /* VTEST_PROTOCOL */
diff --git a/src/virtio/vulkan/vn_renderer_virtgpu.c b/src/virtio/vulkan/vn_renderer_virtgpu.c
index 67fac384552..96017745930 100644
--- a/src/virtio/vulkan/vn_renderer_virtgpu.c
+++ b/src/virtio/vulkan/vn_renderer_virtgpu.c
@@ -22,7 +22,6 @@
 #include "drm-uapi/virtgpu_drm.h"
 #include "util/os_file.h"
 #include "util/sparse_array.h"
-#define VIRGL_RENDERER_UNSTABLE_APIS
 #include "virtio-gpu/virglrenderer_hw.h"
 
 #include "vn_renderer_internal.h"
diff --git a/src/virtio/vulkan/vn_renderer_vtest.c b/src/virtio/vulkan/vn_renderer_vtest.c
index d932ea83aaa..27ccf5252ae 100644
--- a/src/virtio/vulkan/vn_renderer_vtest.c
+++ b/src/virtio/vulkan/vn_renderer_vtest.c
@@ -19,7 +19,6 @@
 #include "util/os_misc.h"
 #include "util/sparse_array.h"
 #include "util/u_process.h"
-#define VIRGL_RENDERER_UNSTABLE_APIS
 #include "virtio-gpu/virglrenderer_hw.h"
 #include "vtest/vtest_protocol.h"