Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/etnaviv: switch to drm_*{get,put} helpers

drm_*_reference() and drm_*_unreference() functions are just
compatibility alias for drm_*_get() and drm_*_put() adn should not be
used by new code. So convert all users of compatibility functions to use
the new APIs.

Signed-off-by: Cihangir Akturk <cakturk@gmail.com>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>

authored by

Cihangir Akturk and committed by
Lucas Stach
23d1dd03 63f56775

+17 -17
+4 -4
drivers/gpu/drm/etnaviv/etnaviv_drv.c
··· 316 316 317 317 ret = etnaviv_gem_cpu_prep(obj, args->op, &TS(args->timeout)); 318 318 319 - drm_gem_object_unreference_unlocked(obj); 319 + drm_gem_object_put_unlocked(obj); 320 320 321 321 return ret; 322 322 } ··· 337 337 338 338 ret = etnaviv_gem_cpu_fini(obj); 339 339 340 - drm_gem_object_unreference_unlocked(obj); 340 + drm_gem_object_put_unlocked(obj); 341 341 342 342 return ret; 343 343 } ··· 357 357 return -ENOENT; 358 358 359 359 ret = etnaviv_gem_mmap_offset(obj, &args->offset); 360 - drm_gem_object_unreference_unlocked(obj); 360 + drm_gem_object_put_unlocked(obj); 361 361 362 362 return ret; 363 363 } ··· 446 446 447 447 ret = etnaviv_gem_wait_bo(gpu, obj, timeout); 448 448 449 - drm_gem_object_unreference_unlocked(obj); 449 + drm_gem_object_put_unlocked(obj); 450 450 451 451 return ret; 452 452 }
+10 -10
drivers/gpu/drm/etnaviv/etnaviv_gem.c
··· 265 265 { 266 266 struct etnaviv_gem_object *etnaviv_obj = mapping->object; 267 267 268 - drm_gem_object_reference(&etnaviv_obj->base); 268 + drm_gem_object_get(&etnaviv_obj->base); 269 269 270 270 mutex_lock(&etnaviv_obj->lock); 271 271 WARN_ON(mapping->use == 0); ··· 282 282 mapping->use -= 1; 283 283 mutex_unlock(&etnaviv_obj->lock); 284 284 285 - drm_gem_object_unreference_unlocked(&etnaviv_obj->base); 285 + drm_gem_object_put_unlocked(&etnaviv_obj->base); 286 286 } 287 287 288 288 struct etnaviv_vram_mapping *etnaviv_gem_mapping_get( ··· 358 358 return ERR_PTR(ret); 359 359 360 360 /* Take a reference on the object */ 361 - drm_gem_object_reference(obj); 361 + drm_gem_object_get(obj); 362 362 return mapping; 363 363 } 364 364 ··· 672 672 return obj; 673 673 674 674 fail: 675 - drm_gem_object_unreference_unlocked(obj); 675 + drm_gem_object_put_unlocked(obj); 676 676 return ERR_PTR(ret); 677 677 } 678 678 ··· 689 689 690 690 ret = etnaviv_gem_obj_add(dev, obj); 691 691 if (ret < 0) { 692 - drm_gem_object_unreference_unlocked(obj); 692 + drm_gem_object_put_unlocked(obj); 693 693 return ret; 694 694 } 695 695 696 696 ret = drm_gem_handle_create(file, obj, handle); 697 697 698 698 /* drop reference from allocate - handle holds it now */ 699 - drm_gem_object_unreference_unlocked(obj); 699 + drm_gem_object_put_unlocked(obj); 700 700 701 701 return ret; 702 702 } ··· 713 713 714 714 ret = etnaviv_gem_obj_add(dev, obj); 715 715 if (ret < 0) { 716 - drm_gem_object_unreference_unlocked(obj); 716 + drm_gem_object_put_unlocked(obj); 717 717 return ERR_PTR(ret); 718 718 } 719 719 ··· 801 801 } 802 802 803 803 mutex_unlock(&etnaviv_obj->lock); 804 - drm_gem_object_unreference_unlocked(&etnaviv_obj->base); 804 + drm_gem_object_put_unlocked(&etnaviv_obj->base); 805 805 806 806 mmput(work->mm); 807 807 put_task_struct(work->task); ··· 859 859 } 860 860 861 861 get_task_struct(current); 862 - drm_gem_object_reference(&etnaviv_obj->base); 862 + drm_gem_object_get(&etnaviv_obj->base); 863 863 864 864 work->mm = mm; 865 865 work->task = current; ··· 925 925 ret = drm_gem_handle_create(file, &etnaviv_obj->base, handle); 926 926 unreference: 927 927 /* drop reference from allocate - handle holds it now */ 928 - drm_gem_object_unreference_unlocked(&etnaviv_obj->base); 928 + drm_gem_object_put_unlocked(&etnaviv_obj->base); 929 929 return ret; 930 930 }
+1 -1
drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c
··· 146 146 return &etnaviv_obj->base; 147 147 148 148 fail: 149 - drm_gem_object_unreference_unlocked(&etnaviv_obj->base); 149 + drm_gem_object_put_unlocked(&etnaviv_obj->base); 150 150 151 151 return ERR_PTR(ret); 152 152 }
+2 -2
drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
··· 88 88 * Take a refcount on the object. The file table lock 89 89 * prevents the object_idr's refcount on this being dropped. 90 90 */ 91 - drm_gem_object_reference(obj); 91 + drm_gem_object_get(obj); 92 92 93 93 submit->bos[i].obj = to_etnaviv_bo(obj); 94 94 } ··· 291 291 struct etnaviv_gem_object *etnaviv_obj = submit->bos[i].obj; 292 292 293 293 submit_unlock_object(submit, i); 294 - drm_gem_object_unreference_unlocked(&etnaviv_obj->base); 294 + drm_gem_object_put_unlocked(&etnaviv_obj->base); 295 295 } 296 296 297 297 ww_acquire_fini(&submit->ticket);