|
@@ -545,35 +545,19 @@ void vmw_fence_obj_flush(struct vmw_fence_obj *fence)
|
|
|
|
|
|
static void vmw_fence_destroy(struct vmw_fence_obj *fence)
|
|
|
{
|
|
|
- struct vmw_fence_manager *fman = fman_from_fence(fence);
|
|
|
-
|
|
|
fence_free(&fence->base);
|
|
|
-
|
|
|
- /*
|
|
|
- * Free kernel space accounting.
|
|
|
- */
|
|
|
- ttm_mem_global_free(vmw_mem_glob(fman->dev_priv),
|
|
|
- fman->fence_size);
|
|
|
}
|
|
|
|
|
|
int vmw_fence_create(struct vmw_fence_manager *fman,
|
|
|
uint32_t seqno,
|
|
|
struct vmw_fence_obj **p_fence)
|
|
|
{
|
|
|
- struct ttm_mem_global *mem_glob = vmw_mem_glob(fman->dev_priv);
|
|
|
struct vmw_fence_obj *fence;
|
|
|
int ret;
|
|
|
|
|
|
- ret = ttm_mem_global_alloc(mem_glob, fman->fence_size,
|
|
|
- false, false);
|
|
|
- if (unlikely(ret != 0))
|
|
|
- return ret;
|
|
|
-
|
|
|
fence = kzalloc(sizeof(*fence), GFP_KERNEL);
|
|
|
- if (unlikely(fence == NULL)) {
|
|
|
- ret = -ENOMEM;
|
|
|
- goto out_no_object;
|
|
|
- }
|
|
|
+ if (unlikely(fence == NULL))
|
|
|
+ return -ENOMEM;
|
|
|
|
|
|
ret = vmw_fence_obj_init(fman, fence, seqno,
|
|
|
vmw_fence_destroy);
|
|
@@ -585,8 +569,6 @@ int vmw_fence_create(struct vmw_fence_manager *fman,
|
|
|
|
|
|
out_err_init:
|
|
|
kfree(fence);
|
|
|
-out_no_object:
|
|
|
- ttm_mem_global_free(mem_glob, fman->fence_size);
|
|
|
return ret;
|
|
|
}
|
|
|
|