diff options
| author | Cihangir Akturk <cakturk@gmail.com> | 2017-08-03 14:58:16 +0300 | 
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2017-08-15 21:46:12 +0300 | 
| commit | f62facc2eb78ebbedae70e394ac034ab9407a244 (patch) | |
| tree | e78fda8410148279d813a9b5ecf77f82e997459b /drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | |
| parent | d45aec0536d4180bc6e9a79f5342bcf0e4f9b660 (diff) | |
| download | linux-f62facc2eb78ebbedae70e394ac034ab9407a244.tar.xz | |
drm/amdgpu: switch to drm_*{get,put} helpers
drm_*_reference() and drm_*_unreference() functions are just
compatibility alias for drm_*_get() and drm_*_put() and should not be
used by new code. So convert all users of compatibility functions to use
the new APIs.
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Cihangir Akturk <cakturk@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 22 | 
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)  		spin_lock(&file->table_lock);  		idr_for_each_entry(&file->object_idr, gobj, handle) {  			WARN_ONCE(1, "And also active allocations!\n"); -			drm_gem_object_unreference_unlocked(gobj); +			drm_gem_object_put_unlocked(gobj);  		}  		idr_destroy(&file->object_idr);  		spin_unlock(&file->table_lock); @@ -263,7 +263,7 @@ int amdgpu_gem_create_ioctl(struct drm_device *dev, void *data,  	r = drm_gem_handle_create(filp, gobj, &handle);  	/* drop reference from allocate - handle holds it now */ -	drm_gem_object_unreference_unlocked(gobj); +	drm_gem_object_put_unlocked(gobj);  	if (r)  		return r; @@ -341,7 +341,7 @@ int amdgpu_gem_userptr_ioctl(struct drm_device *dev, void *data,  	r = drm_gem_handle_create(filp, gobj, &handle);  	/* drop reference from allocate - handle holds it now */ -	drm_gem_object_unreference_unlocked(gobj); +	drm_gem_object_put_unlocked(gobj);  	if (r)  		return r; @@ -355,7 +355,7 @@ unlock_mmap_sem:  	up_read(¤t->mm->mmap_sem);  release_object: -	drm_gem_object_unreference_unlocked(gobj); +	drm_gem_object_put_unlocked(gobj);  	return r;  } @@ -374,11 +374,11 @@ int amdgpu_mode_dumb_mmap(struct drm_file *filp,  	robj = gem_to_amdgpu_bo(gobj);  	if (amdgpu_ttm_tt_get_usermm(robj->tbo.ttm) ||  	    (robj->flags & AMDGPU_GEM_CREATE_NO_CPU_ACCESS)) { -		drm_gem_object_unreference_unlocked(gobj); +		drm_gem_object_put_unlocked(gobj);  		return -EPERM;  	}  	*offset_p = amdgpu_bo_mmap_offset(robj); -	drm_gem_object_unreference_unlocked(gobj); +	drm_gem_object_put_unlocked(gobj);  	return 0;  } @@ -448,7 +448,7 @@ int amdgpu_gem_wait_idle_ioctl(struct drm_device *dev, void *data,  	} else  		r = ret; -	drm_gem_object_unreference_unlocked(gobj); +	drm_gem_object_put_unlocked(gobj);  	return r;  } @@ -491,7 +491,7 @@ int amdgpu_gem_metadata_ioctl(struct drm_device *dev, void *data,  unreserve:  	amdgpu_bo_unreserve(robj);  out: -	drm_gem_object_unreference_unlocked(gobj); +	drm_gem_object_put_unlocked(gobj);  	return r;  } @@ -664,7 +664,7 @@ error_backoff:  	ttm_eu_backoff_reservation(&ticket, &list);  error_unref: -	drm_gem_object_unreference_unlocked(gobj); +	drm_gem_object_put_unlocked(gobj);  	return r;  } @@ -726,7 +726,7 @@ int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data,  	}  out: -	drm_gem_object_unreference_unlocked(gobj); +	drm_gem_object_put_unlocked(gobj);  	return r;  } @@ -754,7 +754,7 @@ int amdgpu_mode_dumb_create(struct drm_file *file_priv,  	r = drm_gem_handle_create(file_priv, gobj, &handle);  	/* drop reference from allocate - handle holds it now */ -	drm_gem_object_unreference_unlocked(gobj); +	drm_gem_object_put_unlocked(gobj);  	if (r) {  		return r;  	} | 
