diff options
Diffstat (limited to 'meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0911-drm-amdgpu-fix-userptr-put_page-handling.patch')
-rw-r--r-- | meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0911-drm-amdgpu-fix-userptr-put_page-handling.patch | 90 |
1 files changed, 0 insertions, 90 deletions
diff --git a/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0911-drm-amdgpu-fix-userptr-put_page-handling.patch b/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0911-drm-amdgpu-fix-userptr-put_page-handling.patch deleted file mode 100644 index b2866771..00000000 --- a/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0911-drm-amdgpu-fix-userptr-put_page-handling.patch +++ /dev/null @@ -1,90 +0,0 @@ -From a9fc51a1216c1137c5089925edf6632fc4ef2643 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> -Date: Sat, 2 Sep 2017 13:21:31 +0200 -Subject: [PATCH 0911/4131] drm/amdgpu: fix userptr put_page handling -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -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> ---- - drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + - drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6 ++---- - drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 14 +++++++++++++- - 3 files changed, 16 insertions(+), 5 deletions(-) - -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h -index fa17a10..3700ad6 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h -@@ -1854,6 +1854,7 @@ void amdgpu_cs_report_moved_bytes(struct amdgpu_device *adev, u64 num_bytes, - void amdgpu_ttm_placement_from_domain(struct amdgpu_bo *abo, u32 domain); - bool amdgpu_ttm_bo_is_amdgpu_bo(struct ttm_buffer_object *bo); - int amdgpu_ttm_tt_get_user_pages(struct ttm_tt *ttm, struct page **pages); -+void amdgpu_ttm_tt_set_user_pages(struct ttm_tt *ttm, struct page **pages); - int amdgpu_ttm_tt_set_userptr(struct ttm_tt *ttm, uint64_t addr, - uint32_t flags); - bool amdgpu_ttm_tt_has_userptr(struct ttm_tt *ttm); -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c -index 8bb55ed..0a1222b 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c -@@ -478,10 +478,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; - } - -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c -index bbe7d2b..4274da4 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c -@@ -721,6 +721,18 @@ int amdgpu_ttm_tt_get_user_pages(struct ttm_tt *ttm, struct page **pages) - return r; - } - -+void amdgpu_ttm_tt_set_user_pages(struct ttm_tt *ttm, struct page **pages) -+{ -+ unsigned i; -+ -+ for (i = 0; i < ttm->num_pages; ++i) { -+ if (ttm->pages[i]) -+ put_page(ttm->pages[i]); -+ -+ ttm->pages[i] = pages ? pages[i] : NULL; -+ } -+} -+ - static void amdgpu_trace_dma_map(struct ttm_tt *ttm) - { - struct amdgpu_device *adev = amdgpu_ttm_adev(ttm->bdev); -@@ -795,7 +807,6 @@ static void amdgpu_ttm_tt_unpin_userptr(struct ttm_tt *ttm) - set_page_dirty(page); - - mark_page_accessed(page); -- put_page(page); - } - - amdgpu_trace_dma_unmap(ttm); -@@ -1021,6 +1032,7 @@ static void amdgpu_ttm_tt_unpopulate(struct ttm_tt *ttm) - bool slave = !!(ttm->page_flags & TTM_PAGE_FLAG_SG); - - if (gtt && gtt->userptr) { -+ amdgpu_ttm_tt_set_user_pages(ttm, NULL); - kfree(ttm->sg); - ttm->page_flags &= ~TTM_PAGE_FLAG_SG; - return; --- -2.7.4 - |