Not needed any more now we have that inside the framework.

Signed-off-by: Christian König <christian.koe...@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h |  1 -
 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c      | 52 +++------------------
 2 files changed, 6 insertions(+), 47 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h
index 044b41f0bfd9..529d52a204cf 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h
@@ -34,7 +34,6 @@ struct amdgpu_fpriv;
 struct amdgpu_bo_list_entry {
        struct ttm_validate_buffer      tv;
        struct amdgpu_bo_va             *bo_va;
-       struct dma_fence_chain          *chain;
        uint32_t                        priority;
        struct page                     **user_pages;
        bool                            user_invalidated;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 92091e800022..413606d10080 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -576,14 +576,6 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p,
                struct amdgpu_bo *bo = ttm_to_amdgpu_bo(e->tv.bo);
 
                e->bo_va = amdgpu_vm_bo_find(vm, bo);
-
-               if (bo->tbo.base.dma_buf && !amdgpu_bo_explicit_sync(bo)) {
-                       e->chain = dma_fence_chain_alloc();
-                       if (!e->chain) {
-                               r = -ENOMEM;
-                               goto error_validate;
-                       }
-               }
        }
 
        amdgpu_cs_get_threshold_for_moves(p->adev, &p->bytes_moved_threshold,
@@ -634,13 +626,8 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p,
        }
 
 error_validate:
-       if (r) {
-               amdgpu_bo_list_for_each_entry(e, p->bo_list) {
-                       dma_fence_chain_free(e->chain);
-                       e->chain = NULL;
-               }
+       if (r)
                ttm_eu_backoff_reservation(&p->ticket, &p->validated);
-       }
 out:
        return r;
 }
@@ -680,17 +667,9 @@ static void amdgpu_cs_parser_fini(struct amdgpu_cs_parser 
*parser, int error,
 {
        unsigned i;
 
-       if (error && backoff) {
-               struct amdgpu_bo_list_entry *e;
-
-               amdgpu_bo_list_for_each_entry(e, parser->bo_list) {
-                       dma_fence_chain_free(e->chain);
-                       e->chain = NULL;
-               }
-
+       if (error && backoff)
                ttm_eu_backoff_reservation(&parser->ticket,
                                           &parser->validated);
-       }
 
        for (i = 0; i < parser->num_post_deps; i++) {
                drm_syncobj_put(parser->post_deps[i].syncobj);
@@ -1265,29 +1244,10 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p,
 
        amdgpu_vm_move_to_lru_tail(p->adev, &fpriv->vm);
 
-       amdgpu_bo_list_for_each_entry(e, p->bo_list) {
-               struct dma_resv *resv = e->tv.bo->base.resv;
-               struct dma_fence_chain *chain = e->chain;
-               struct dma_resv_iter cursor;
-               struct dma_fence *fence;
-
-               if (!chain)
-                       continue;
-
-               /*
-                * Work around dma_resv shortcommings by wrapping up the
-                * submission in a dma_fence_chain and add it as exclusive
-                * fence.
-                */
-               dma_resv_for_each_fence(&cursor, resv,
-                                       DMA_RESV_USAGE_WRITE,
-                                       fence) {
-                       break;
-               }
-               dma_fence_chain_init(chain, fence, dma_fence_get(p->fence), 1);
-               dma_resv_add_fence(resv, &chain->base, DMA_RESV_USAGE_WRITE);
-               e->chain = NULL;
-       }
+       /* For now manually add the resulting fence as writer as well */
+       amdgpu_bo_list_for_each_entry(e, p->bo_list)
+               dma_resv_add_fence(e->tv.bo->base.resv, p->fence,
+                                  DMA_RESV_USAGE_WRITE);
 
        ttm_eu_fence_buffer_objects(&p->ticket, &p->validated, p->fence);
        mutex_unlock(&p->adev->notifier_lock);
-- 
2.25.1

Reply via email to