drm/amdgpu: simplify and fix amdgpu_sync_resv

No matter what we always need to sync to moves.

Signed-off-by: Christian König <christian.koenig@amd.com>
Tested-by: Tom St Denis <tom.stdenis@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
index c124f64e7aaeb80f81b6e1265ee92454f541dce4..9f42032676da3ed05b95653b6e25fdec1721bf39 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
@@ -232,10 +232,19 @@ int amdgpu_sync_resv(struct amdgpu_device *adev, struct amdgpu_sync *sync,
 
                f = rcu_dereference_protected(flist->shared[i],
                                              dma_resv_held(resv));
+
+               fence_owner = amdgpu_sync_get_owner(f);
+
+               /* Always sync to moves, no matter what */
+               if (fence_owner == AMDGPU_FENCE_OWNER_UNDEFINED) {
+                       r = amdgpu_sync_fence(sync, f, false);
+                       if (r)
+                               break;
+               }
+
                /* We only want to trigger KFD eviction fences on
                 * evict or move jobs. Skip KFD fences otherwise.
                 */
-               fence_owner = amdgpu_sync_get_owner(f);
                if (fence_owner == AMDGPU_FENCE_OWNER_KFD &&
                    owner != AMDGPU_FENCE_OWNER_UNDEFINED)
                        continue;
@@ -265,9 +274,7 @@ int amdgpu_sync_resv(struct amdgpu_device *adev, struct amdgpu_sync *sync,
                        break;
 
                case AMDGPU_SYNC_EXPLICIT:
-                       if (owner != AMDGPU_FENCE_OWNER_UNDEFINED)
-                               continue;
-                       break;
+                       continue;
                }
 
                r = amdgpu_sync_fence(sync, f, false);