Module: Mesa Branch: main Commit: e8a63cf61ecdf7cd80e4fe84f740816978f1d17d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e8a63cf61ecdf7cd80e4fe84f740816978f1d17d
Author: Yiwei Zhang <[email protected]> Date: Wed Mar 30 01:10:05 2022 +0000 virgl: fake modifier plane count query support dri2_create_image_from_fd might pass host modifier. Before virgl consumes modifier info from the guest side, fake the support so that the image creation can still proceed instead of bailing. Signed-off-by: Yiwei Zhang <[email protected]> Reviewed-by: Chia-I Wu <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15658> --- src/gallium/drivers/virgl/virgl_screen.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/gallium/drivers/virgl/virgl_screen.c b/src/gallium/drivers/virgl/virgl_screen.c index 0f0a60fa0e1..ed0898dab02 100644 --- a/src/gallium/drivers/virgl/virgl_screen.c +++ b/src/gallium/drivers/virgl/virgl_screen.c @@ -968,6 +968,29 @@ static void virgl_disk_cache_create(struct virgl_screen *screen) screen->disk_cache = disk_cache_create("virgl", timestamp, 0); } +static bool +virgl_is_dmabuf_modifier_supported(UNUSED struct pipe_screen *pscreen, + UNUSED uint64_t modifier, + UNUSED enum pipe_format format, + UNUSED bool *external_only) +{ + /* Always advertise support until virgl starts checking against host + * virglrenderer or consuming valid non-linear modifiers here. + */ + return true; +} + +static unsigned int +virgl_get_dmabuf_modifier_planes(UNUSED struct pipe_screen *pscreen, + UNUSED uint64_t modifier, + enum pipe_format format) +{ + /* Return the format plane count queried from pipe_format. For virgl, + * additional aux planes are entirely resolved on the host side. + */ + return util_format_get_num_planes(format); +} + static void fixup_renderer(union virgl_caps *caps) { @@ -1036,6 +1059,8 @@ virgl_create_screen(struct virgl_winsys *vws, const struct pipe_screen_config *c screen->base.fence_get_fd = virgl_fence_get_fd; screen->base.query_memory_info = virgl_query_memory_info; screen->base.get_disk_shader_cache = virgl_get_disk_shader_cache; + screen->base.is_dmabuf_modifier_supported = virgl_is_dmabuf_modifier_supported; + screen->base.get_dmabuf_modifier_planes = virgl_get_dmabuf_modifier_planes; virgl_init_screen_resource_functions(&screen->base);
