aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
index 3f0b4d1450ff..dafa139c0ca7 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
@@ -2195,11 +2195,11 @@ int vmw_execbuf_process(struct drm_file *file_priv,
2195 ret = vmw_cmd_check_all(dev_priv, sw_context, kernel_commands, 2195 ret = vmw_cmd_check_all(dev_priv, sw_context, kernel_commands,
2196 command_size); 2196 command_size);
2197 if (unlikely(ret != 0)) 2197 if (unlikely(ret != 0))
2198 goto out_err; 2198 goto out_err_nores;
2199 2199
2200 ret = vmw_resources_reserve(sw_context); 2200 ret = vmw_resources_reserve(sw_context);
2201 if (unlikely(ret != 0)) 2201 if (unlikely(ret != 0))
2202 goto out_err; 2202 goto out_err_nores;
2203 2203
2204 ret = ttm_eu_reserve_buffers(&ticket, &sw_context->validate_nodes); 2204 ret = ttm_eu_reserve_buffers(&ticket, &sw_context->validate_nodes);
2205 if (unlikely(ret != 0)) 2205 if (unlikely(ret != 0))
@@ -2291,10 +2291,11 @@ int vmw_execbuf_process(struct drm_file *file_priv,
2291out_unlock_binding: 2291out_unlock_binding:
2292 mutex_unlock(&dev_priv->binding_mutex); 2292 mutex_unlock(&dev_priv->binding_mutex);
2293out_err: 2293out_err:
2294 vmw_resource_relocations_free(&sw_context->res_relocations);
2295 vmw_free_relocations(sw_context);
2296 ttm_eu_backoff_reservation(&ticket, &sw_context->validate_nodes); 2294 ttm_eu_backoff_reservation(&ticket, &sw_context->validate_nodes);
2295out_err_nores:
2297 vmw_resource_list_unreserve(&sw_context->resource_list, true); 2296 vmw_resource_list_unreserve(&sw_context->resource_list, true);
2297 vmw_resource_relocations_free(&sw_context->res_relocations);
2298 vmw_free_relocations(sw_context);
2298 vmw_clear_validations(sw_context); 2299 vmw_clear_validations(sw_context);
2299 if (unlikely(dev_priv->pinned_bo != NULL && 2300 if (unlikely(dev_priv->pinned_bo != NULL &&
2300 !dev_priv->query_cid_valid)) 2301 !dev_priv->query_cid_valid))