Mesa (main): ci: Enable kernel virtio transport for Virtual Sockets

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: fcce90a095e0d36d2bc1397202f405e529950137
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fcce90a095e0d36d2bc1397202f405e529950137

Author: Cristian Ciocaltea <cristian.ciocaltea at collabora.com>
Date:   Thu Feb  3 20:05:38 2022 +0200

ci: Enable kernel virtio transport for Virtual Sockets

Enable support for Virtual Sockets over virtio in kernel configuration
to optimize the data transfer between crosvm and host system.

Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea at collabora.com>
Reviewed-by: Daniel Stone <daniels at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14995>

---

 .gitlab-ci/container/x86_64.config | 3 +++
 .gitlab-ci/image-tags.yml          | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci/container/x86_64.config b/.gitlab-ci/container/x86_64.config
index 1859540fbf1..3bad799e5f3 100644
--- a/.gitlab-ci/container/x86_64.config
+++ b/.gitlab-ci/container/x86_64.config
@@ -98,3 +98,6 @@ CONFIG_CRYPTO_DEV_VIRTIO=y
 CONFIG_HW_RANDOM_VIRTIO=y
 CONFIG_BLK_MQ_VIRTIO=y
 CONFIG_TUN=y
+CONFIG_VSOCKETS=y
+CONFIG_VIRTIO_VSOCKETS=y
+CONFIG_VHOST_VSOCK=m
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 5f0c0d72188..7bea3be8522 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -8,11 +8,11 @@ variables:
    DEBIAN_X86_TEST_BASE_IMAGE: "debian/x86_test-base"
 
    DEBIAN_X86_TEST_IMAGE_PATH: "debian/x86_test-gl"
-   DEBIAN_X86_TEST_GL_TAG: "2022-02-14-virgl-update"
+   DEBIAN_X86_TEST_GL_TAG: "2022-02-17-vsock"
    DEBIAN_X86_TEST_VK_TAG: "2022-02-06-deqp"
 
    FEDORA_X86_BUILD_TAG: "2021-12-31-refactor"
-   KERNEL_ROOTFS_TAG: "2022-02-15-pytest"
+   KERNEL_ROOTFS_TAG: "2022-02-17-vsock"
 
    WINDOWS_X64_BUILD_PATH: "windows/x64_build"
    WINDOWS_X64_BUILD_TAG: "2022-20-02-base_split"