1 files changed, 13 insertions, 0 deletions

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
index 2ff7ba04d8c8..315f9efce765 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
@@ -2010,6 +2010,11 @@ static int vmw_cmd_set_shader(struct vmw_private *dev_priv,
                 return 0;
 
         if (cmd->body.shid != SVGA3D_INVALID_ID) {
+                /*
+                 * This is the compat shader path - Per device guest-backed
+                 * shaders, but user-space thinks it's per context host-
+                 * backed shaders.
+                 */
                 res = vmw_shader_lookup(vmw_context_res_man(ctx),
                                         cmd->body.shid, cmd->body.type);
                 if (!IS_ERR(res)) {
@@ -2017,6 +2022,14 @@ static int vmw_cmd_set_shader(struct vmw_private *dev_priv,
                                                             VMW_RES_DIRTY_NONE);
                         if (unlikely(ret != 0))
                                 return ret;
+
+                        ret = vmw_resource_relocation_add
+                                (sw_context, res,
+                                 vmw_ptr_diff(sw_context->buf_start,
+                                              &cmd->body.shid),
+                                 vmw_res_rel_normal);
+                        if (unlikely(ret != 0))
+                                return ret;
                 }
         }