Commit f4490759 authored by Thomas Zimmermann's avatar Thomas Zimmermann Committed by Alex Deucher

drm/ttm: Replace ttm_bo_unref() with ttm_bo_put()

A call to ttm_bo_unref() clears the supplied pointer to NULL, while
ttm_bo_put() does not. None of the converted call sites requires the
pointer to become NULL, so the respective assign operations has been
left out from the patch.
Signed-off-by: default avatarThomas Zimmermann <contact@tzimmermann.org>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 8129fdad
...@@ -1204,7 +1204,7 @@ int ttm_bo_init_reserved(struct ttm_bo_device *bdev, ...@@ -1204,7 +1204,7 @@ int ttm_bo_init_reserved(struct ttm_bo_device *bdev,
if (!resv) if (!resv)
ttm_bo_unreserve(bo); ttm_bo_unreserve(bo);
ttm_bo_unref(&bo); ttm_bo_put(bo);
return ret; return ret;
} }
......
...@@ -463,7 +463,7 @@ static void ttm_transfered_destroy(struct ttm_buffer_object *bo) ...@@ -463,7 +463,7 @@ static void ttm_transfered_destroy(struct ttm_buffer_object *bo)
struct ttm_transfer_obj *fbo; struct ttm_transfer_obj *fbo;
fbo = container_of(bo, struct ttm_transfer_obj, base); fbo = container_of(bo, struct ttm_transfer_obj, base);
ttm_bo_unref(&fbo->bo); ttm_bo_put(fbo->bo);
kfree(fbo); kfree(fbo);
} }
...@@ -731,7 +731,7 @@ int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo, ...@@ -731,7 +731,7 @@ int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo,
bo->ttm = NULL; bo->ttm = NULL;
ttm_bo_unreserve(ghost_obj); ttm_bo_unreserve(ghost_obj);
ttm_bo_unref(&ghost_obj); ttm_bo_put(ghost_obj);
} }
*old_mem = *new_mem; *old_mem = *new_mem;
...@@ -787,7 +787,7 @@ int ttm_bo_pipeline_move(struct ttm_buffer_object *bo, ...@@ -787,7 +787,7 @@ int ttm_bo_pipeline_move(struct ttm_buffer_object *bo,
bo->ttm = NULL; bo->ttm = NULL;
ttm_bo_unreserve(ghost_obj); ttm_bo_unreserve(ghost_obj);
ttm_bo_unref(&ghost_obj); ttm_bo_put(ghost_obj);
} else if (from->flags & TTM_MEMTYPE_FLAG_FIXED) { } else if (from->flags & TTM_MEMTYPE_FLAG_FIXED) {
...@@ -852,7 +852,7 @@ int ttm_bo_pipeline_gutting(struct ttm_buffer_object *bo) ...@@ -852,7 +852,7 @@ int ttm_bo_pipeline_gutting(struct ttm_buffer_object *bo)
bo->ttm = NULL; bo->ttm = NULL;
ttm_bo_unreserve(ghost); ttm_bo_unreserve(ghost);
ttm_bo_unref(&ghost); ttm_bo_put(ghost);
return 0; return 0;
} }
...@@ -72,7 +72,7 @@ static vm_fault_t ttm_bo_vm_fault_idle(struct ttm_buffer_object *bo, ...@@ -72,7 +72,7 @@ static vm_fault_t ttm_bo_vm_fault_idle(struct ttm_buffer_object *bo,
up_read(&vmf->vma->vm_mm->mmap_sem); up_read(&vmf->vma->vm_mm->mmap_sem);
(void) dma_fence_wait(bo->moving, true); (void) dma_fence_wait(bo->moving, true);
ttm_bo_unreserve(bo); ttm_bo_unreserve(bo);
ttm_bo_unref(&bo); ttm_bo_put(bo);
goto out_unlock; goto out_unlock;
} }
...@@ -141,7 +141,7 @@ static vm_fault_t ttm_bo_vm_fault(struct vm_fault *vmf) ...@@ -141,7 +141,7 @@ static vm_fault_t ttm_bo_vm_fault(struct vm_fault *vmf)
ttm_bo_get(bo); ttm_bo_get(bo);
up_read(&vmf->vma->vm_mm->mmap_sem); up_read(&vmf->vma->vm_mm->mmap_sem);
(void) ttm_bo_wait_unreserved(bo); (void) ttm_bo_wait_unreserved(bo);
ttm_bo_unref(&bo); ttm_bo_put(bo);
} }
return VM_FAULT_RETRY; return VM_FAULT_RETRY;
...@@ -309,7 +309,7 @@ static void ttm_bo_vm_close(struct vm_area_struct *vma) ...@@ -309,7 +309,7 @@ static void ttm_bo_vm_close(struct vm_area_struct *vma)
{ {
struct ttm_buffer_object *bo = (struct ttm_buffer_object *)vma->vm_private_data; struct ttm_buffer_object *bo = (struct ttm_buffer_object *)vma->vm_private_data;
ttm_bo_unref(&bo); ttm_bo_put(bo);
vma->vm_private_data = NULL; vma->vm_private_data = NULL;
} }
...@@ -461,7 +461,7 @@ int ttm_bo_mmap(struct file *filp, struct vm_area_struct *vma, ...@@ -461,7 +461,7 @@ int ttm_bo_mmap(struct file *filp, struct vm_area_struct *vma,
vma->vm_flags |= VM_IO | VM_DONTEXPAND | VM_DONTDUMP; vma->vm_flags |= VM_IO | VM_DONTEXPAND | VM_DONTDUMP;
return 0; return 0;
out_unref: out_unref:
ttm_bo_unref(&bo); ttm_bo_put(bo);
return ret; return ret;
} }
EXPORT_SYMBOL(ttm_bo_mmap); EXPORT_SYMBOL(ttm_bo_mmap);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment