drm/amdgpu: fix userptr put_page handling

Move calling put_page into the unpopulate callback. Otherwise we mess up the pages
reference count when it is unbound multiple times.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 233b6f2f8427..e58db0c69c6a 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -474,10 +474,8 @@ static int amdgpu_cs_list_validate(struct amdgpu_cs_parser *p,
 
                 /* Check if we have user pages and nobody bound the BO already */
                 if (lobj->user_pages && bo->tbo.ttm->state != tt_bound) {
-                        size_t size = sizeof(struct page *);
-
-                        size *= bo->tbo.ttm->num_pages;
-                        memcpy(bo->tbo.ttm->pages, lobj->user_pages, size);
+                        amdgpu_ttm_tt_set_user_pages(bo->tbo.ttm,
+                                                     lobj->user_pages);
                         binding_userptr = true;
                 }