diff options
Diffstat (limited to 'meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0914-drm-amdgpu-stop-using-BO-status-for-user-pages.patch')
| -rw-r--r-- | meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0914-drm-amdgpu-stop-using-BO-status-for-user-pages.patch | 126 |
1 files changed, 0 insertions, 126 deletions
diff --git a/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0914-drm-amdgpu-stop-using-BO-status-for-user-pages.patch b/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0914-drm-amdgpu-stop-using-BO-status-for-user-pages.patch deleted file mode 100644 index feefd3ed..00000000 --- a/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0914-drm-amdgpu-stop-using-BO-status-for-user-pages.patch +++ /dev/null @@ -1,126 +0,0 @@ -From 0c4afe17da162e9be827d973cd40a05ae67691b6 Mon Sep 17 00:00:00 2001 -From: = Christian Koenig <christian.koenig@amd.com> -Date: Tue, 5 Sep 2017 14:30:05 +0200 -Subject: [PATCH 0914/4131] drm/amdgpu: stop using BO status for user pages -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Instead use a counter to figure out if we need to set new pages or not. - -Signed-off-by: Christian König <christian.koenig@amd.com> -Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com> -Signed-off-by: Kalyan Alle <kalyan.alle@amd.com> ---- - drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + - drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 13 ++++++++----- - drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 14 ++++++++++++++ - 3 files changed, 23 insertions(+), 5 deletions(-) - -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h -index 3700ad6..67d1418 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h -@@ -1863,6 +1863,7 @@ bool amdgpu_ttm_tt_affect_userptr(struct ttm_tt *ttm, unsigned long start, - unsigned long end); - bool amdgpu_ttm_tt_userptr_invalidated(struct ttm_tt *ttm, - int *last_invalidated); -+bool amdgpu_ttm_tt_userptr_needs_pages(struct ttm_tt *ttm); - bool amdgpu_ttm_tt_is_readonly(struct ttm_tt *ttm); - uint64_t amdgpu_ttm_tt_pte_flags(struct amdgpu_device *adev, struct ttm_tt *ttm, - struct ttm_mem_reg *mem); -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c -index 0a1222b..03616e1 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c -@@ -477,7 +477,8 @@ static int amdgpu_cs_list_validate(struct amdgpu_cs_parser *p, - return -EPERM; - - /* Check if we have user pages and nobody bound the BO already */ -- if (lobj->user_pages && bo->tbo.ttm->state != tt_bound) { -+ if (amdgpu_ttm_tt_userptr_needs_pages(bo->tbo.ttm) && -+ lobj->user_pages) { - amdgpu_ttm_tt_set_user_pages(bo->tbo.ttm, - lobj->user_pages); - binding_userptr = true; -@@ -545,23 +546,25 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p, - INIT_LIST_HEAD(&need_pages); - for (i = p->bo_list->first_userptr; - i < p->bo_list->num_entries; ++i) { -+ struct amdgpu_bo *bo; - - e = &p->bo_list->array[i]; -- -- if (amdgpu_ttm_tt_userptr_invalidated(e->robj->tbo.ttm, -+ bo = e->robj; -+ -+ if (amdgpu_ttm_tt_userptr_invalidated(bo->tbo.ttm, - &e->user_invalidated) && e->user_pages) { - - /* We acquired a page array, but somebody - * invalidated it. Free it and try again - */ - release_pages(e->user_pages, -- e->robj->tbo.ttm->num_pages, -+ bo->tbo.ttm->num_pages, - false); - kvfree(e->user_pages); - e->user_pages = NULL; - } - -- if (e->robj->tbo.ttm->state != tt_bound && -+ if (amdgpu_ttm_tt_userptr_needs_pages(bo->tbo.ttm) && - !e->user_pages) { - list_del(&e->tv.head); - list_add(&e->tv.head, &need_pages); -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c -index 4274da4..60b5e3a 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c -@@ -662,6 +662,7 @@ struct amdgpu_ttm_tt { - spinlock_t guptasklock; - struct list_head guptasks; - atomic_t mmu_invalidations; -+ uint32_t last_set_pages; - struct list_head list; - }; - -@@ -723,8 +724,10 @@ 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) - { -+ struct amdgpu_ttm_tt *gtt = (void *)ttm; - unsigned i; - -+ gtt->last_set_pages = atomic_read(>t->mmu_invalidations); - for (i = 0; i < ttm->num_pages; ++i) { - if (ttm->pages[i]) - put_page(ttm->pages[i]); -@@ -1062,6 +1065,7 @@ int amdgpu_ttm_tt_set_userptr(struct ttm_tt *ttm, uint64_t addr, - spin_lock_init(>t->guptasklock); - INIT_LIST_HEAD(>t->guptasks); - atomic_set(>t->mmu_invalidations, 0); -+ gtt->last_set_pages = 0; - - return 0; - } -@@ -1117,6 +1121,16 @@ bool amdgpu_ttm_tt_userptr_invalidated(struct ttm_tt *ttm, - return prev_invalidated != *last_invalidated; - } - -+bool amdgpu_ttm_tt_userptr_needs_pages(struct ttm_tt *ttm) -+{ -+ struct amdgpu_ttm_tt *gtt = (void *)ttm; -+ -+ if (gtt == NULL || !gtt->userptr) -+ return false; -+ -+ return atomic_read(>t->mmu_invalidations) != gtt->last_set_pages; -+} -+ - bool amdgpu_ttm_tt_is_readonly(struct ttm_tt *ttm) - { - struct amdgpu_ttm_tt *gtt = (void *)ttm; --- -2.7.4 - |