drm/amdgpu: partial revert VM sync changes

We still need to add the VM update fences to the root PD.

So make sure to never sync to those implicitely.

Signed-off-by: Christian König <christian.koenig@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 b8639225369611a2fbdfe899bc94ef9f88af8a4a..b87ca171986af0879394d0f09634f641b006d26f 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
@@ -249,6 +249,11 @@ int amdgpu_sync_resv(struct amdgpu_device *adev, struct amdgpu_sync *sync,
                    owner != AMDGPU_FENCE_OWNER_UNDEFINED)
                        continue;
 
+               /* Never sync to VM updates either. */
+               if (fence_owner == AMDGPU_FENCE_OWNER_VM &&
+                   owner != AMDGPU_FENCE_OWNER_UNDEFINED)
+                       continue;
+
                /* Ignore fences depending on the sync mode */
                switch (mode) {
                case AMDGPU_SYNC_ALWAYS: