2012/3/14 Michel D?nzer <michel at daenzer.net>:
> From: Michel D?nzer <michel.daenzer at amd.com>
>
> Only radeon_gem_object_unpin was used anymore, in only one place.
>
> Signed-off-by: Michel D?nzer <michel.daenzer at amd.com>
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
> ---
> ?drivers/gpu/drm/radeon/radeon.h ? ? ? ?| ? ?3 ---
> ?drivers/gpu/drm/radeon/radeon_cursor.c | ? ?7 ++++++-
> ?drivers/gpu/drm/radeon/radeon_gem.c ? ?| ? 26 --------------------------
> ?3 files changed, 6 insertions(+), 30 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
> index ec995ca..1414900 100644
> --- a/drivers/gpu/drm/radeon/radeon.h
> +++ b/drivers/gpu/drm/radeon/radeon.h
> @@ -375,9 +375,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,
> diff --git a/drivers/gpu/drm/radeon/radeon_cursor.c
> b/drivers/gpu/drm/radeon/radeon_cursor.c
> index 986d608..42acc64 100644
> --- a/drivers/gpu/drm/radeon/radeon_cursor.c
> +++ b/drivers/gpu/drm/radeon/radeon_cursor.c
> @@ -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);
> ? ? ? ?}
>
> diff --git a/drivers/gpu/drm/radeon/radeon_gem.c
> b/drivers/gpu/drm/radeon/radeon_gem.c
> index 003eeec..090da31 100644
> --- a/drivers/gpu/drm/radeon/radeon_gem.c
> +++ b/drivers/gpu/drm/radeon/radeon_gem.c
> @@ -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)
> ?{
> --
> 1.7.9.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
