aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/linux-yocto-4.19.8/0913-drm-amdgpu-fix-using-shared-fence-for-exported-BOs-v.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.19.8/0913-drm-amdgpu-fix-using-shared-fence-for-exported-BOs-v.patch')
-rw-r--r--common/recipes-kernel/linux/linux-yocto-4.19.8/0913-drm-amdgpu-fix-using-shared-fence-for-exported-BOs-v.patch70
1 files changed, 70 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.19.8/0913-drm-amdgpu-fix-using-shared-fence-for-exported-BOs-v.patch b/common/recipes-kernel/linux/linux-yocto-4.19.8/0913-drm-amdgpu-fix-using-shared-fence-for-exported-BOs-v.patch
new file mode 100644
index 00000000..08e4c1ec
--- /dev/null
+++ b/common/recipes-kernel/linux/linux-yocto-4.19.8/0913-drm-amdgpu-fix-using-shared-fence-for-exported-BOs-v.patch
@@ -0,0 +1,70 @@
+From 5ec84e944e6709e1bd764d51ee32c6163d880fa0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
+Date: Wed, 19 Sep 2018 16:54:35 +0200
+Subject: [PATCH 0913/2940] drm/amdgpu: fix using shared fence for exported BOs
+ v2
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+It is perfectly possible that the BO list is created before the BO is
+exported. While at it clean up setting shared to one instead of true.
+
+v2: add comment and simplify logic
+
+Signed-off-by: Christian König <christian.koenig@amd.com>
+Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+Reviewed-by: Huang Rui <ray.huang@amd.com>
+Acked-by: Junwei Zhang <Jerry.Zhang@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 13 +++++++++++--
+ 2 files changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c
+index b75d30ee80c6..5c79da8e1150 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c
+@@ -118,7 +118,6 @@ int amdgpu_bo_list_create(struct amdgpu_device *adev, struct drm_file *filp,
+ entry->priority = min(info[i].bo_priority,
+ AMDGPU_BO_LIST_MAX_PRIORITY);
+ entry->tv.bo = &bo->tbo;
+- entry->tv.num_shared = !bo->prime_shared_count;
+
+ if (bo->preferred_domains == AMDGPU_GEM_DOMAIN_GDS)
+ list->gds_obj = bo;
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+index a19786a2136b..35ebf24612df 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+@@ -599,6 +599,9 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p,
+ return r;
+ }
+
++ amdgpu_bo_list_for_each_entry(e, p->bo_list)
++ e->tv.num_shared = 1;
++
+ amdgpu_bo_list_get_list(p->bo_list, &p->validated);
+ if (p->bo_list->first_userptr != p->bo_list->num_entries)
+ p->mn = amdgpu_mn_get(p->adev, AMDGPU_MN_TYPE_GFX);
+@@ -718,8 +721,14 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p,
+ gws = p->bo_list->gws_obj;
+ oa = p->bo_list->oa_obj;
+
+- amdgpu_bo_list_for_each_entry(e, p->bo_list)
+- e->bo_va = amdgpu_vm_bo_find(vm, ttm_to_amdgpu_bo(e->tv.bo));
++ amdgpu_bo_list_for_each_entry(e, p->bo_list) {
++ struct amdgpu_bo *bo = ttm_to_amdgpu_bo(e->tv.bo);
++
++ /* Make sure we use the exclusive slot for shared BOs */
++ if (bo->prime_shared_count)
++ e->tv.num_shared = 0;
++ e->bo_va = amdgpu_vm_bo_find(vm, bo);
++ }
+
+ if (gds) {
+ p->job->gds_base = amdgpu_bo_gpu_offset(gds) >> PAGE_SHIFT;
+--
+2.17.1
+