1 files changed, 128 insertions, 99 deletions

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
index 87df0b3674fd..7bfdaa163a33 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
@@ -422,28 +422,91 @@ static int vmw_resources_validate(struct vmw_sw_context *sw_context)
         return 0;
 }
 
+
+/**
+ * vmw_cmd_res_reloc_add - Add a resource to a software context's
+ * relocation- and validation lists.
+ *
+ * @dev_priv: Pointer to a struct vmw_private identifying the device.
+ * @sw_context: Pointer to the software context.
+ * @res_type: Resource type.
+ * @id_loc: Pointer to where the id that needs translation is located.
+ * @res: Valid pointer to a struct vmw_resource.
+ * @p_val: If non null, a pointer to the struct vmw_resource_validate_node
+ * used for this resource is returned here.
+ */
+static int vmw_cmd_res_reloc_add(struct vmw_private *dev_priv,
+                                 struct vmw_sw_context *sw_context,
+                                 enum vmw_res_type res_type,
+                                 uint32_t *id_loc,
+                                 struct vmw_resource *res,
+                                 struct vmw_resource_val_node **p_val)
+{
+        int ret;
+        struct vmw_resource_val_node *node;
+
+        *p_val = NULL;
+        ret = vmw_resource_relocation_add(&sw_context->res_relocations,
+                                          res,
+                                          id_loc - sw_context->buf_start);
+        if (unlikely(ret != 0))
+                goto out_err;
+
+        ret = vmw_resource_val_add(sw_context, res, &node);
+        if (unlikely(ret != 0))
+                goto out_err;
+
+        if (res_type == vmw_res_context && dev_priv->has_mob &&
+            node->first_usage) {
+
+                /*
+                 * Put contexts first on the list to be able to exit
+                 * list traversal for contexts early.
+                 */
+                list_del(&node->head);
+                list_add(&node->head, &sw_context->resource_list);
+
+                ret = vmw_resource_context_res_add(dev_priv, sw_context, res);
+                if (unlikely(ret != 0))
+                        goto out_err;
+                node->staged_bindings =
+                        kzalloc(sizeof(*node->staged_bindings), GFP_KERNEL);
+                if (node->staged_bindings == NULL) {
+                        DRM_ERROR("Failed to allocate context binding "
+                                  "information.\n");
+                        goto out_err;
+                }
+                INIT_LIST_HEAD(&node->staged_bindings->list);
+        }
+
+        if (p_val)
+                *p_val = node;
+
+out_err:
+        return ret;
+}
+
+
 /**
- * vmw_cmd_compat_res_check - Check that a resource is present and if so, put it
+ * vmw_cmd_res_check - Check that a resource is present and if so, put it
  * on the resource validate list unless it's already there.
  *
  * @dev_priv: Pointer to a device private structure.
  * @sw_context: Pointer to the software context.
  * @res_type: Resource type.
  * @converter: User-space visisble type specific information.
- * @id: user-space resource id handle.
  * @id_loc: Pointer to the location in the command buffer currently being
  * parsed from where the user-space resource id handle is located.
  * @p_val: Pointer to pointer to resource validalidation node. Populated
  * on exit.
  */
 static int
-vmw_cmd_compat_res_check(struct vmw_private *dev_priv,
-                         struct vmw_sw_context *sw_context,
-                         enum vmw_res_type res_type,
-                         const struct vmw_user_resource_conv *converter,
-                         uint32_t id,
-                         uint32_t *id_loc,
-                         struct vmw_resource_val_node **p_val)
+vmw_cmd_res_check(struct vmw_private *dev_priv,
+                  struct vmw_sw_context *sw_context,
+                  enum vmw_res_type res_type,
+                  const struct vmw_user_resource_conv *converter,
+                  uint32_t *id_loc,
+                  struct vmw_resource_val_node **p_val)
 {
         struct vmw_res_cache_entry *rcache =
                 &sw_context->res_cache[res_type];
@@ -451,7 +514,7 @@ vmw_cmd_compat_res_check(struct vmw_private *dev_priv,
         struct vmw_resource_val_node *node;
         int ret;
 
-        if (id == SVGA3D_INVALID_ID) {
+        if (*id_loc == SVGA3D_INVALID_ID) {
                 if (p_val)
                         *p_val = NULL;
                 if (res_type == vmw_res_context) {
@@ -466,7 +529,7 @@ vmw_cmd_compat_res_check(struct vmw_private *dev_priv,
          * resource
          */
 
-        if (likely(rcache->valid && id == rcache->handle)) {
+        if (likely(rcache->valid && *id_loc == rcache->handle)) {
                 const struct vmw_resource *res = rcache->res;
 
                 rcache->node->first_usage = false;
@@ -480,49 +543,28 @@ vmw_cmd_compat_res_check(struct vmw_private *dev_priv,
 
         ret = vmw_user_resource_lookup_handle(dev_priv,
                                               sw_context->fp->tfile,
-                                              id,
+                                              *id_loc,
                                               converter,
                                               &res);
         if (unlikely(ret != 0)) {
                 DRM_ERROR("Could not find or use resource 0x%08x.\n",
-                          (unsigned) id);
+                          (unsigned) *id_loc);
                 dump_stack();
                 return ret;
         }
 
         rcache->valid = true;
         rcache->res = res;
-        rcache->handle = id;
-
-        ret = vmw_resource_relocation_add(&sw_context->res_relocations,
-                                          res,
-                                          id_loc - sw_context->buf_start);
-        if (unlikely(ret != 0))
-                goto out_no_reloc;
+        rcache->handle = *id_loc;
 
-        ret = vmw_resource_val_add(sw_context, res, &node);
+        ret = vmw_cmd_res_reloc_add(dev_priv, sw_context, res_type, id_loc,
+                                    res, &node);
         if (unlikely(ret != 0))
                 goto out_no_reloc;
 
         rcache->node = node;
         if (p_val)
                 *p_val = node;
-
-        if (dev_priv->has_mob && node->first_usage &&
-            res_type == vmw_res_context) {
-                ret = vmw_resource_context_res_add(dev_priv, sw_context, res);
-                if (unlikely(ret != 0))
-                        goto out_no_reloc;
-                node->staged_bindings =
-                        kzalloc(sizeof(*node->staged_bindings), GFP_KERNEL);
-                if (node->staged_bindings == NULL) {
-                        DRM_ERROR("Failed to allocate context binding "
-                                  "information.\n");
-                        goto out_no_reloc;
-                }
-                INIT_LIST_HEAD(&node->staged_bindings->list);
-        }
-
         vmw_resource_unreference(&res);
         return 0;
 
@@ -534,31 +576,6 @@ out_no_reloc:
 }
 
 /**
- * vmw_cmd_res_check - Check that a resource is present and if so, put it
- * on the resource validate list unless it's already there.
- *
- * @dev_priv: Pointer to a device private structure.
- * @sw_context: Pointer to the software context.
- * @res_type: Resource type.
- * @converter: User-space visisble type specific information.
- * @id_loc: Pointer to the location in the command buffer currently being
- * parsed from where the user-space resource id handle is located.
- * @p_val: Pointer to pointer to resource validalidation node. Populated
- * on exit.
- */
-static int
-vmw_cmd_res_check(struct vmw_private *dev_priv,
-                  struct vmw_sw_context *sw_context,
-                  enum vmw_res_type res_type,
-                  const struct vmw_user_resource_conv *converter,
-                  uint32_t *id_loc,
-                  struct vmw_resource_val_node **p_val)
-{
-        return vmw_cmd_compat_res_check(dev_priv, sw_context, res_type,
-                                        converter, *id_loc, id_loc, p_val);
-}
-
-/**
  * vmw_rebind_contexts - Rebind all resources previously bound to
  * referenced contexts.
  *
@@ -572,8 +589,8 @@ static int vmw_rebind_contexts(struct vmw_sw_context *sw_context)
         int ret;
 
         list_for_each_entry(val, &sw_context->resource_list, head) {
-                if (likely(!val->staged_bindings))
-                        continue;
+                if (unlikely(!val->staged_bindings))
+                        break;
 
                 ret = vmw_context_rebind_all(val->res);
                 if (unlikely(ret != 0)) {
@@ -1626,13 +1643,14 @@ static int vmw_cmd_shader_define(struct vmw_private *dev_priv,
         } *cmd;
         int ret;
         size_t size;
+        struct vmw_resource_val_node *val;
 
         cmd = container_of(header, struct vmw_shader_define_cmd,
                            header);
 
         ret = vmw_cmd_res_check(dev_priv, sw_context, vmw_res_context,
                                 user_context_converter, &cmd->body.cid,
-                                NULL);
+                                &val);
         if (unlikely(ret != 0))
                 return ret;
 
@@ -1640,11 +1658,11 @@ static int vmw_cmd_shader_define(struct vmw_private *dev_priv,
                 return 0;
 
         size = cmd->header.size - sizeof(cmd->body);
-        ret = vmw_compat_shader_add(sw_context->fp->shman,
+        ret = vmw_compat_shader_add(dev_priv,
+                                    vmw_context_res_man(val->res),
                                     cmd->body.shid, cmd + 1,
                                     cmd->body.type, size,
-                                    sw_context->fp->tfile,
-                                    &sw_context->staged_shaders);
+                                    &sw_context->staged_cmd_res);
         if (unlikely(ret != 0))
                 return ret;
 
@@ -1672,23 +1690,24 @@ static int vmw_cmd_shader_destroy(struct vmw_private *dev_priv,
                 SVGA3dCmdDestroyShader body;
         } *cmd;
         int ret;
+        struct vmw_resource_val_node *val;
 
         cmd = container_of(header, struct vmw_shader_destroy_cmd,
                            header);
 
         ret = vmw_cmd_res_check(dev_priv, sw_context, vmw_res_context,
                                 user_context_converter, &cmd->body.cid,
-                                NULL);
+                                &val);
         if (unlikely(ret != 0))
                 return ret;
 
         if (unlikely(!dev_priv->has_mob))
                 return 0;
 
-        ret = vmw_compat_shader_remove(sw_context->fp->shman,
+        ret = vmw_compat_shader_remove(vmw_context_res_man(val->res),
                                        cmd->body.shid,
                                        cmd->body.type,
-                                       &sw_context->staged_shaders);
+                                       &sw_context->staged_cmd_res);
         if (unlikely(ret != 0))
                 return ret;
 
@@ -1715,7 +1734,9 @@ static int vmw_cmd_set_shader(struct vmw_private *dev_priv,
                 SVGA3dCmdHeader header;
                 SVGA3dCmdSetShader body;
         } *cmd;
-        struct vmw_resource_val_node *ctx_node;
+        struct vmw_resource_val_node *ctx_node, *res_node = NULL;
+        struct vmw_ctx_bindinfo bi;
+        struct vmw_resource *res = NULL;
         int ret;
 
         cmd = container_of(header, struct vmw_set_shader_cmd,
@@ -1727,32 +1748,40 @@ static int vmw_cmd_set_shader(struct vmw_private *dev_priv,
         if (unlikely(ret != 0))
                 return ret;
 
-        if (dev_priv->has_mob) {
-                struct vmw_ctx_bindinfo bi;
-                struct vmw_resource_val_node *res_node;
-                u32 shid = cmd->body.shid;
-
-                if (shid != SVGA3D_INVALID_ID)
-                        (void) vmw_compat_shader_lookup(sw_context->fp->shman,
-                                                        cmd->body.type,
-                                                        &shid);
-
-                ret = vmw_cmd_compat_res_check(dev_priv, sw_context,
-                                               vmw_res_shader,
-                                               user_shader_converter,
-                                               shid,
-                                               &cmd->body.shid, &res_node);
+        if (!dev_priv->has_mob)
+                return 0;
+
+        if (cmd->body.shid != SVGA3D_INVALID_ID) {
+                res = vmw_compat_shader_lookup
+                        (vmw_context_res_man(ctx_node->res),
+                         cmd->body.shid,
+                         cmd->body.type);
+
+                if (!IS_ERR(res)) {
+                        ret = vmw_cmd_res_reloc_add(dev_priv, sw_context,
+                                                    vmw_res_shader,
+                                                    &cmd->body.shid, res,
+                                                    &res_node);
+                        vmw_resource_unreference(&res);
+                        if (unlikely(ret != 0))
+                                return ret;
+                }
+        }
+
+        if (!res_node) {
+                ret = vmw_cmd_res_check(dev_priv, sw_context,
+                                        vmw_res_shader,
+                                        user_shader_converter,
+                                        &cmd->body.shid, &res_node);
                 if (unlikely(ret != 0))
                         return ret;
-
-                bi.ctx = ctx_node->res;
-                bi.res = res_node ? res_node->res : NULL;
-                bi.bt = vmw_ctx_binding_shader;
-                bi.i1.shader_type = cmd->body.type;
-                return vmw_context_binding_add(ctx_node->staged_bindings, &bi);
         }
 
-        return 0;
+        bi.ctx = ctx_node->res;
+        bi.res = res_node ? res_node->res : NULL;
+        bi.bt = vmw_ctx_binding_shader;
+        bi.i1.shader_type = cmd->body.type;
+        return vmw_context_binding_add(ctx_node->staged_bindings, &bi);
 }
 
 /**
@@ -2394,6 +2423,8 @@ vmw_execbuf_copy_fence_user(struct vmw_private *dev_priv,
         }
 }
 
+
+
 int vmw_execbuf_process(struct drm_file *file_priv,
                         struct vmw_private *dev_priv,
                         void __user *user_commands,
@@ -2453,7 +2484,7 @@ int vmw_execbuf_process(struct drm_file *file_priv,
                         goto out_unlock;
                 sw_context->res_ht_initialized = true;
         }
-        INIT_LIST_HEAD(&sw_context->staged_shaders);
+        INIT_LIST_HEAD(&sw_context->staged_cmd_res);
 
         INIT_LIST_HEAD(&resource_list);
         ret = vmw_cmd_check_all(dev_priv, sw_context, kernel_commands,
@@ -2548,8 +2579,7 @@ int vmw_execbuf_process(struct drm_file *file_priv,
         }
 
         list_splice_init(&sw_context->resource_list, &resource_list);
-        vmw_compat_shaders_commit(sw_context->fp->shman,
-                                  &sw_context->staged_shaders);
+        vmw_cmdbuf_res_commit(&sw_context->staged_cmd_res);
         mutex_unlock(&dev_priv->cmdbuf_mutex);
 
         /*
@@ -2576,8 +2606,7 @@ out_unlock:
         list_splice_init(&sw_context->resource_list, &resource_list);
         error_resource = sw_context->error_resource;
         sw_context->error_resource = NULL;
-        vmw_compat_shaders_revert(sw_context->fp->shman,
-                                  &sw_context->staged_shaders);
+        vmw_cmdbuf_res_revert(&sw_context->staged_cmd_res);
         mutex_unlock(&dev_priv->cmdbuf_mutex);
 
         /*