diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2827-Revert-drm-amdgpu-fix-using-shared-fence-for-exporte.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2827-Revert-drm-amdgpu-fix-using-shared-fence-for-exporte.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2827-Revert-drm-amdgpu-fix-using-shared-fence-for-exporte.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2827-Revert-drm-amdgpu-fix-using-shared-fence-for-exporte.patch new file mode 100644 index 00000000..994a86ee --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2827-Revert-drm-amdgpu-fix-using-shared-fence-for-exporte.patch @@ -0,0 +1,53 @@ +From 1e4a9872f910936b1aa73f19e131a052d49728a3 Mon Sep 17 00:00:00 2001 +From: Chaudhary Amit Kumar <Chaudharyamit.Kumar@amd.com> +Date: Wed, 31 Jul 2019 14:14:53 +0530 +Subject: [PATCH 2827/2940] Revert "drm/amdgpu: fix using shared fence for + exported BOs v2" + +This reverts commit b791f267e859e5794897447a02a46e98bf0fbcfe. +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 8 -------- + 2 files changed, 1 insertion(+), 8 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c +index d497467b7fc6..c6c186debbe2 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c +@@ -118,6 +118,7 @@ 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 4e3dc5dd295a..880164b6a7d7 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +@@ -601,10 +601,6 @@ 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 = 2; +- + 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); +@@ -688,10 +684,6 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p, + + 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); + } + +-- +2.17.1 + |