1 files changed, 7 insertions, 1 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index 6d8c32377c6f..7dddfdce85e6 100644
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -397,9 +397,15 @@ static int radeon_bo_move(struct ttm_buffer_object *bo,
                         struct ttm_mem_reg *new_mem)
 {
         struct radeon_device *rdev;
+        struct radeon_bo *rbo;
         struct ttm_mem_reg *old_mem = &bo->mem;
         int r;
 
+        /* Can't move a pinned BO */
+        rbo = container_of(bo, struct radeon_bo, tbo);
+        if (WARN_ON_ONCE(rbo->pin_count > 0))
+                return -EINVAL;
+
         rdev = radeon_get_rdev(bo->bdev);
         if (old_mem->mem_type == TTM_PL_SYSTEM && bo->ttm == NULL) {
                 radeon_move_null(bo, new_mem);
@@ -609,7 +615,7 @@ static void radeon_ttm_tt_unpin_userptr(struct ttm_tt *ttm)
                         set_page_dirty(page);
 
                 mark_page_accessed(page);
-                page_cache_release(page);
+                put_page(page);
         }
 
         sg_free_table(ttm->sg);