diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.19.8/0915-drm-amdgpu-always-reserve-one-more-shared-slot-for-p.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.19.8/0915-drm-amdgpu-always-reserve-one-more-shared-slot-for-p.patch | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.19.8/0915-drm-amdgpu-always-reserve-one-more-shared-slot-for-p.patch b/common/recipes-kernel/linux/linux-yocto-4.19.8/0915-drm-amdgpu-always-reserve-one-more-shared-slot-for-p.patch new file mode 100644 index 00000000..66238ad0 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.19.8/0915-drm-amdgpu-always-reserve-one-more-shared-slot-for-p.patch @@ -0,0 +1,64 @@ +From 752a17f19305cfbf2fef10de99ea9a04195738e4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> +Date: Mon, 24 Sep 2018 13:35:08 +0200 +Subject: [PATCH 0915/2940] drm/amdgpu: always reserve one more shared slot for + pipelined BO moves +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This allows us to drop the extra reserve in TTM. + +Signed-off-by: Christian König <christian.koenig@amd.com> +Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> +Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com> +Reviewed-by: Huang Rui <ray.huang@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6 ++++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 ++-- + 2 files changed, 6 insertions(+), 4 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +index 811acb7bcf04..0e382b1752f7 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +@@ -51,7 +51,8 @@ static int amdgpu_cs_user_fence_chunk(struct amdgpu_cs_parser *p, + bo = amdgpu_bo_ref(gem_to_amdgpu_bo(gobj)); + p->uf_entry.priority = 0; + p->uf_entry.tv.bo = &bo->tbo; +- p->uf_entry.tv.num_shared = 1; ++ /* One for TTM and one for the CS job */ ++ p->uf_entry.tv.num_shared = 2; + p->uf_entry.user_pages = NULL; + + drm_gem_object_put_unlocked(gobj); +@@ -599,8 +600,9 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p, + return r; + } + ++ /* One for TTM and one for the CS job */ + amdgpu_bo_list_for_each_entry(e, p->bo_list) +- e->tv.num_shared = 1; ++ e->tv.num_shared = 2; + + amdgpu_bo_list_get_list(p->bo_list, &p->validated); + if (p->bo_list->first_userptr != p->bo_list->num_entries) +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +index ba324a1cae5e..aea9488d06fe 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +@@ -617,8 +617,8 @@ void amdgpu_vm_get_pd_bo(struct amdgpu_vm *vm, + { + entry->priority = 0; + entry->tv.bo = &vm->root.base.bo->tbo; +- /* One for the VM updates and one for the CS job */ +- entry->tv.num_shared = 2; ++ /* One for the VM updates, one for TTM and one for the CS job */ ++ entry->tv.num_shared = 3; + entry->user_pages = NULL; + list_add(&entry->tv.head, validated); + } +-- +2.17.1 + |