aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
index a227d34d3852..86a88a025b17 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
@@ -91,7 +91,7 @@ void amdgpu_gem_force_release(struct amdgpu_device *adev)
91 spin_lock(&file->table_lock); 91 spin_lock(&file->table_lock);
92 idr_for_each_entry(&file->object_idr, gobj, handle) { 92 idr_for_each_entry(&file->object_idr, gobj, handle) {
93 WARN_ONCE(1, "And also active allocations!\n"); 93 WARN_ONCE(1, "And also active allocations!\n");
94 drm_gem_object_unreference_unlocked(gobj); 94 drm_gem_object_put_unlocked(gobj);
95 } 95 }
96 idr_destroy(&file->object_idr); 96 idr_destroy(&file->object_idr);
97 spin_unlock(&file->table_lock); 97 spin_unlock(&file->table_lock);
@@ -263,7 +263,7 @@ int amdgpu_gem_create_ioctl(struct drm_device *dev, void *data,
263 263
264 r = drm_gem_handle_create(filp, gobj, &handle); 264 r = drm_gem_handle_create(filp, gobj, &handle);
265 /* drop reference from allocate - handle holds it now */ 265 /* drop reference from allocate - handle holds it now */
266 drm_gem_object_unreference_unlocked(gobj); 266 drm_gem_object_put_unlocked(gobj);
267 if (r) 267 if (r)
268 return r; 268 return r;
269 269
@@ -341,7 +341,7 @@ int amdgpu_gem_userptr_ioctl(struct drm_device *dev, void *data,
341 341
342 r = drm_gem_handle_create(filp, gobj, &handle); 342 r = drm_gem_handle_create(filp, gobj, &handle);
343 /* drop reference from allocate - handle holds it now */ 343 /* drop reference from allocate - handle holds it now */
344 drm_gem_object_unreference_unlocked(gobj); 344 drm_gem_object_put_unlocked(gobj);
345 if (r) 345 if (r)
346 return r; 346 return r;
347 347
@@ -355,7 +355,7 @@ unlock_mmap_sem:
355 up_read(&current->mm->mmap_sem); 355 up_read(&current->mm->mmap_sem);
356 356
357release_object: 357release_object:
358 drm_gem_object_unreference_unlocked(gobj); 358 drm_gem_object_put_unlocked(gobj);
359 359
360 return r; 360 return r;
361} 361}
@@ -374,11 +374,11 @@ int amdgpu_mode_dumb_mmap(struct drm_file *filp,
374 robj = gem_to_amdgpu_bo(gobj); 374 robj = gem_to_amdgpu_bo(gobj);
375 if (amdgpu_ttm_tt_get_usermm(robj->tbo.ttm) || 375 if (amdgpu_ttm_tt_get_usermm(robj->tbo.ttm) ||
376 (robj->flags & AMDGPU_GEM_CREATE_NO_CPU_ACCESS)) { 376 (robj->flags & AMDGPU_GEM_CREATE_NO_CPU_ACCESS)) {
377 drm_gem_object_unreference_unlocked(gobj); 377 drm_gem_object_put_unlocked(gobj);
378 return -EPERM; 378 return -EPERM;
379 } 379 }
380 *offset_p = amdgpu_bo_mmap_offset(robj); 380 *offset_p = amdgpu_bo_mmap_offset(robj);
381 drm_gem_object_unreference_unlocked(gobj); 381 drm_gem_object_put_unlocked(gobj);
382 return 0; 382 return 0;
383} 383}
384 384
@@ -448,7 +448,7 @@ int amdgpu_gem_wait_idle_ioctl(struct drm_device *dev, void *data,
448 } else 448 } else
449 r = ret; 449 r = ret;
450 450
451 drm_gem_object_unreference_unlocked(gobj); 451 drm_gem_object_put_unlocked(gobj);
452 return r; 452 return r;
453} 453}
454 454
@@ -491,7 +491,7 @@ int amdgpu_gem_metadata_ioctl(struct drm_device *dev, void *data,
491unreserve: 491unreserve:
492 amdgpu_bo_unreserve(robj); 492 amdgpu_bo_unreserve(robj);
493out: 493out:
494 drm_gem_object_unreference_unlocked(gobj); 494 drm_gem_object_put_unlocked(gobj);
495 return r; 495 return r;
496} 496}
497 497
@@ -664,7 +664,7 @@ error_backoff:
664 ttm_eu_backoff_reservation(&ticket, &list); 664 ttm_eu_backoff_reservation(&ticket, &list);
665 665
666error_unref: 666error_unref:
667 drm_gem_object_unreference_unlocked(gobj); 667 drm_gem_object_put_unlocked(gobj);
668 return r; 668 return r;
669} 669}
670 670
@@ -726,7 +726,7 @@ int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data,
726 } 726 }
727 727
728out: 728out:
729 drm_gem_object_unreference_unlocked(gobj); 729 drm_gem_object_put_unlocked(gobj);
730 return r; 730 return r;
731} 731}
732 732
@@ -754,7 +754,7 @@ int amdgpu_mode_dumb_create(struct drm_file *file_priv,
754 754
755 r = drm_gem_handle_create(file_priv, gobj, &handle); 755 r = drm_gem_handle_create(file_priv, gobj, &handle);
756 /* drop reference from allocate - handle holds it now */ 756 /* drop reference from allocate - handle holds it now */
757 drm_gem_object_unreference_unlocked(gobj); 757 drm_gem_object_put_unlocked(gobj);
758 if (r) { 758 if (r) {
759 return r; 759 return r;
760 } 760 }