Skip to content

Commit 21d1d19

Browse files
committed
drm/vmwgfx: Disable command buffers on svga3 without gbobjects
With very limited vram on svga3 it's difficult to handle all the surface migrations. Without gbobjects, i.e. the ability to store surfaces in guest mobs, there's no reason to support intermediate svga2 features, especially because we can fall back to fb traces and svga3 will never support those in-between features. On svga3 we wither want to use fb traces or screen targets (i.e. gbobjects), nothing in between. This fixes presentation on a lot of fusion/esxi tech previews where the exposed svga3 caps haven't been finalized yet. Signed-off-by: Zack Rusin <zackr@vmware.com> Fixes: 2cd80db ("drm/vmwgfx: Add basic support for SVGA3") Cc: <stable@vger.kernel.org> # v5.14+ Reviewed-by: Martin Krastev <krastevm@vmware.com> Link: https://patchwork.freedesktop.org/patch/msgid/20220318174332.440068-5-zack@kde.org
1 parent 3059d9b commit 21d1d19

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -675,11 +675,14 @@ int vmw_cmd_emit_dummy_query(struct vmw_private *dev_priv,
675675
*/
676676
bool vmw_cmd_supported(struct vmw_private *vmw)
677677
{
678-
if ((vmw->capabilities & (SVGA_CAP_COMMAND_BUFFERS |
679-
SVGA_CAP_CMD_BUFFERS_2)) != 0)
680-
return true;
678+
bool has_cmdbufs =
679+
(vmw->capabilities & (SVGA_CAP_COMMAND_BUFFERS |
680+
SVGA_CAP_CMD_BUFFERS_2)) != 0;
681+
if (vmw_is_svga_v3(vmw))
682+
return (has_cmdbufs &&
683+
(vmw->capabilities & SVGA_CAP_GBOBJECTS) != 0);
681684
/*
682685
* We have FIFO cmd's
683686
*/
684-
return vmw->fifo_mem != NULL;
687+
return has_cmdbufs || vmw->fifo_mem != NULL;
685688
}

0 commit comments

Comments
 (0)