1 files changed, 6 insertions, 8 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
index d4fcf5475464..7b840367004c 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
@@ -330,26 +330,24 @@ int amdgpu_gem_userptr_ioctl(struct drm_device *dev, void *data,
 
                 r = amdgpu_bo_reserve(bo, true);
                 if (r)
-                        goto free_pages;
+                        goto user_pages_done;
 
                 amdgpu_bo_placement_from_domain(bo, AMDGPU_GEM_DOMAIN_GTT);
                 r = ttm_bo_validate(&bo->tbo, &bo->placement, &ctx);
                 amdgpu_bo_unreserve(bo);
                 if (r)
-                        goto free_pages;
+                        goto user_pages_done;
         }
 
         r = drm_gem_handle_create(filp, gobj, &handle);
-        /* drop reference from allocate - handle holds it now */
-        drm_gem_object_put_unlocked(gobj);
         if (r)
-                return r;
+                goto user_pages_done;
 
         args->handle = handle;
-        return 0;
 
-free_pages:
-        release_pages(bo->tbo.ttm->pages, bo->tbo.ttm->num_pages);
+user_pages_done:
+        if (args->flags & AMDGPU_GEM_USERPTR_VALIDATE)
+                amdgpu_ttm_tt_get_user_pages_done(bo->tbo.ttm);
 
 release_object:
         drm_gem_object_put_unlocked(gobj);