Commit 654c59cf authored by Michel Dänzer's avatar Michel Dänzer Committed by Dave Airlie
Browse files

drm/radeon: Drop radeon_gem_object_(un)pin. 



Only radeon_gem_object_unpin was used anymore, in only one place.

Signed-off-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 0349af70

drivers/gpu/drm/radeon/radeon.h

+0 −3
Original line number Diff line number Diff line
@@ -414,9 +414,6 @@ int radeon_gem_object_create(struct radeon_device *rdev, int size, 
				int alignment, int initial_domain,

				bool discardable, bool kernel,

				struct drm_gem_object **obj);

int radeon_gem_object_pin(struct drm_gem_object *obj, uint32_t pin_domain,

			  uint64_t *gpu_addr);

void radeon_gem_object_unpin(struct drm_gem_object *obj);



int radeon_mode_dumb_create(struct drm_file *file_priv,

			    struct drm_device *dev,

drivers/gpu/drm/radeon/radeon_cursor.c

+6 −1
Original line number Diff line number Diff line
@@ -197,7 +197,12 @@ int radeon_crtc_cursor_set(struct drm_crtc *crtc, 


unpin:

	if (radeon_crtc->cursor_bo) {

		radeon_gem_object_unpin(radeon_crtc->cursor_bo);

		robj = gem_to_radeon_bo(radeon_crtc->cursor_bo);

		ret = radeon_bo_reserve(robj, false);

		if (likely(ret == 0)) {

			radeon_bo_unpin(robj);

			radeon_bo_unreserve(robj);

		}

		drm_gem_object_unreference_unlocked(radeon_crtc->cursor_bo);

	}

drivers/gpu/drm/radeon/radeon_gem.c

+0 −26
Original line number Diff line number Diff line
@@ -75,32 +75,6 @@ int radeon_gem_object_create(struct radeon_device *rdev, int size, 
	return 0;

}



int radeon_gem_object_pin(struct drm_gem_object *obj, uint32_t pin_domain,

			  uint64_t *gpu_addr)

{

	struct radeon_bo *robj = gem_to_radeon_bo(obj);

	int r;



	r = radeon_bo_reserve(robj, false);

	if (unlikely(r != 0))

		return r;

	r = radeon_bo_pin(robj, pin_domain, gpu_addr);

	radeon_bo_unreserve(robj);

	return r;

}



void radeon_gem_object_unpin(struct drm_gem_object *obj)

{

	struct radeon_bo *robj = gem_to_radeon_bo(obj);

	int r;



	r = radeon_bo_reserve(robj, false);

	if (likely(r == 0)) {

		radeon_bo_unpin(robj);

		radeon_bo_unreserve(robj);

	}

}



int radeon_gem_set_domain(struct drm_gem_object *gobj,

			  uint32_t rdomain, uint32_t wdomain)

{