From 20db89b7c7c546a12c1263dd5519a0ee1d825710 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Tue, 11 Jan 2022 10:12:10 -0800 Subject: [PATCH] virgl: disable texture uploads with copy transfers This disables cdc480585c9 ("virgl/drm: New optimization for uploading textures") effectively. Signed-off-by: Chia-I Wu Reviewed-by: Lepton Wu Acked-by: Gert Wollny Part-of: --- src/gallium/drivers/virgl/virgl_resource.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/gallium/drivers/virgl/virgl_resource.c b/src/gallium/drivers/virgl/virgl_resource.c index 5dc8253bf37..e3d82fb0f10 100644 --- a/src/gallium/drivers/virgl/virgl_resource.c +++ b/src/gallium/drivers/virgl/virgl_resource.c @@ -60,9 +60,11 @@ enum virgl_transfer_map_type { static bool virgl_can_copy_transfer_from_host(struct virgl_screen *vs, struct virgl_resource *res) { +#if 0 /* TODO re-enable this */ if (vs->caps.caps.v2.capability_bits_v2 & VIRGL_CAP_V2_COPY_TRANSFER_BOTH_DIRECTIONS && res->b.target != PIPE_BUFFER) return true; +#endif return false; } @@ -202,10 +204,12 @@ virgl_resource_transfer_prepare(struct virgl_context *vctx, VIRGL_QUEUED_STAGING_RES_SIZE_LIMIT); } +#if 0 /* TODO re-enable this */ /* We can use staging buffer for texture uploads from guest to host */ if (can_staging && res->b.target != PIPE_BUFFER) { map_type = VIRGL_TRANSFER_MAP_WRITE_TO_STAGING; } +#endif } }