Merge drm/drm-next into drm-misc-next

[sfrench/cifs-2.6.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_cs.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 970b065e9a6b13929ed6f29bf1fc28e413e8b756..e85e347eb6700e18ee4c803b097877c5b767bd37 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -1275,18 +1275,23 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p,
        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 shortcomings by wrapping up the
-                * submission in a dma_fence_chain and add it as exclusive
+                * Temporary workaround dma_resv shortcommings by wrapping up
+                * the submission in a dma_fence_chain and add it as exclusive
                 * fence.
+                *
+                * TODO: Remove together with dma_resv rework.
                 */
-               dma_fence_chain_init(chain, dma_resv_excl_fence(resv),
-                                    dma_fence_get(p->fence), 1);
-
+               dma_resv_for_each_fence(&cursor, resv, false, fence) {
+                       break;
+               }
+               dma_fence_chain_init(chain, fence, dma_fence_get(p->fence), 1);
                rcu_assign_pointer(resv->fence_excl, &chain->base);
                e->chain = NULL;
        }