xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/vmwgfx: Mark a surface gpu-dirty after the SVGA3dCmdDXGenMips command

Browse Source 
[ Upstream commit 75156a887b6cea6e09d83ec19f4ebfd7c86265f0 ]

The SVGA3dCmdDXGenMips command uses a shader-resource view to access
the underlying surface. Normally accesses using that view-type are not
dirtying the underlying surface, but that particular command is an
exception.
Mark the surface gpu-dirty after a SVGA3dCmdDXGenMips command has been
submitted.

This fixes the piglit getteximage-formats test run with
SVGA_FORCE_COHERENT=1

Fixes: a9f58c456e ("drm/vmwgfx: Be more restrictive when dirtying resources")
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Charmaine Lee <charmainel@vmware.com>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Signed-off-by: Zack Rusin <zackr@vmware.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210505035740.286923-3-zackr@vmware.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Thomas Hellstrom
2021-05-04 23:57:36 -04:00
committed by Greg Kroah-Hartman
parent 8f2b15ec3b
commit a8e85ed088
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
View File

@@ -2759,12 +2759,24 @@ static int vmw_cmd_dx_genmips(struct vmw_private *dev_priv,
{ {
VMW_DECLARE_CMD_VAR(*cmd, SVGA3dCmdDXGenMips) = VMW_DECLARE_CMD_VAR(*cmd, SVGA3dCmdDXGenMips) =
container_of(header, typeof(*cmd), header); container_of(header, typeof(*cmd), header);
struct vmw_resource *ret; struct vmw_resource *view;
struct vmw_res_cache_entry *rcache;
ret = vmw_view_id_val_add(sw_context, vmw_view_sr, view = vmw_view_id_val_add(sw_context, vmw_view_sr,
cmd->body.shaderResourceViewId); cmd->body.shaderResourceViewId);
if (IS_ERR(view))
return PTR_ERR(view);
return PTR_ERR_OR_ZERO(ret); /*
* Normally the shader-resource view is not gpu-dirtying, but for
* this particular command it is...
* So mark the last looked-up surface, which is the surface
* the view points to, gpu-dirty.
*/
rcache = &sw_context->res_cache[vmw_res_surface];
vmw_validation_res_set_dirty(sw_context->ctx, rcache->private,
VMW_RES_DIRTY_SET);
return 0;
} }
/** /**