drm/vmwgfx: Fix subresource updates with new contexts

[ Upstream commit a12be0277316ed923411c9c80b2899ee74d2b033 ]

The has_dx variable was only set during the initialization which
meant that UPDATE_SUBRESOURCE was never used. We were emulating it
with UPDATE_GB_IMAGE but that's always been a stop-gap. Instead
of has_dx which has been deprecated a long time ago we need to check
for whether shader model 4.0 or newer is available to the device.

Signed-off-by: Zack Rusin <zackr@vmware.com>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Reviewed-by: Martin Krastev <krastevm@vmware.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210609172307.131929-4-zackr@vmware.com
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
index beab3e19d8e2190813dcbdfaae16ba712a932928..5ff88f8c2382a6e2929ef5ef81006c22f95a8125 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
@@ -1883,7 +1883,6 @@ static void vmw_surface_dirty_range_add(struct vmw_resource *res, size_t start,
 static int vmw_surface_dirty_sync(struct vmw_resource *res)
 {
        struct vmw_private *dev_priv = res->dev_priv;
-       bool has_dx = 0;
        u32 i, num_dirty;
        struct vmw_surface_dirty *dirty =
                (struct vmw_surface_dirty *) res->dirty;
@@ -1910,7 +1909,7 @@ static int vmw_surface_dirty_sync(struct vmw_resource *res)
        if (!num_dirty)
                goto out;
 
-       alloc_size = num_dirty * ((has_dx) ? sizeof(*cmd1) : sizeof(*cmd2));
+       alloc_size = num_dirty * ((has_sm4_context(dev_priv)) ? sizeof(*cmd1) : sizeof(*cmd2));
        cmd = VMW_CMD_RESERVE(dev_priv, alloc_size);
        if (!cmd)
                return -ENOMEM;
@@ -1928,7 +1927,7 @@ static int vmw_surface_dirty_sync(struct vmw_resource *res)
                 * DX_UPDATE_SUBRESOURCE is aware of array surfaces.
                 * UPDATE_GB_IMAGE is not.
                 */
-               if (has_dx) {
+               if (has_sm4_context(dev_priv)) {
                        cmd1->header.id = SVGA_3D_CMD_DX_UPDATE_SUBRESOURCE;
                        cmd1->header.size = sizeof(cmd1->body);
                        cmd1->body.sid = res->id;