virgl/video: Add more pipe type in virgl formats convert table

Add Y8_400_UNORM, YUYV, Y8_U8_V8_444_UNORM,
R8G8_R8B8_UNORM into virgl_formats_conv_table to fix
the resource create fail issue.

Signed-off-by: Honglei Huang <honglei1.huang@amd.com>
Reviewed-by: Leo Liu <leo.liu@amd.com>
Reviewed-by: Boyuan Zhang <boyuan.zhang@amd.com>
Reviewed-by: Daniel Almeida <daniel.almeida@collabora.com>
Reviewed-by: Feng Jiang <jiangfeng@kylinos.cn>
Signed-off-by: Huang Rui <ray.huang@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22108>

diff --git a/src/gallium/drivers/virgl/virgl_encode.c b/src/gallium/drivers/virgl/virgl_encode.c
index 7fbc7d0..199a52e 100644 (file)
--- a/src/gallium/drivers/virgl/virgl_encode.c
+++ b/src/gallium/drivers/virgl/virgl_encode.c
@@ -313,6 +313,10 @@ static const enum virgl_formats virgl_formats_conv_table[PIPE_FORMAT_COUNT] = {
    CONV_FORMAT(ASTC_12x10_SRGB)
    CONV_FORMAT(ASTC_12x12_SRGB)
    CONV_FORMAT(P010)
+   CONV_FORMAT(Y8_400_UNORM)
+   CONV_FORMAT(YUYV)
+   CONV_FORMAT(Y8_U8_V8_444_UNORM)
+   CONV_FORMAT(R8G8_R8B8_UNORM)
 };
 
 enum virgl_formats pipe_to_virgl_format(enum pipe_format format)

diff --git a/src/virtio/virtio-gpu/virgl_hw.h b/src/virtio/virtio-gpu/virgl_hw.h
index 0dd16e7..a0cf8a9 100644 (file)
--- a/src/virtio/virtio-gpu/virgl_hw.h
+++ b/src/virtio/virtio-gpu/virgl_hw.h
@@ -409,6 +409,8 @@ enum virgl_formats {
    VIRGL_FORMAT_R5G5B5A1_UNORM          = 320,
    VIRGL_FORMAT_R5G6B5_UNORM            = 321,
 
+   VIRGL_FORMAT_Y8_400_UNORM            = 322,
+   VIRGL_FORMAT_Y8_U8_V8_444_UNORM      = 323,
    VIRGL_FORMAT_MAX /* = PIPE_FORMAT_COUNT */,
 
    /* Below formats must not be used in the guest. */