diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index e615fffdb3f2..5961d63f8913 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h | |||
@@ -405,7 +405,6 @@ struct amdgpu_fence_driver { | |||
405 | /* some special values for the owner field */ | 405 | /* some special values for the owner field */ |
406 | #define AMDGPU_FENCE_OWNER_UNDEFINED ((void*)0ul) | 406 | #define AMDGPU_FENCE_OWNER_UNDEFINED ((void*)0ul) |
407 | #define AMDGPU_FENCE_OWNER_VM ((void*)1ul) | 407 | #define AMDGPU_FENCE_OWNER_VM ((void*)1ul) |
408 | #define AMDGPU_FENCE_OWNER_MOVE ((void*)2ul) | ||
409 | 408 | ||
410 | #define AMDGPU_FENCE_FLAG_64BIT (1 << 0) | 409 | #define AMDGPU_FENCE_FLAG_64BIT (1 << 0) |
411 | #define AMDGPU_FENCE_FLAG_INT (1 << 1) | 410 | #define AMDGPU_FENCE_FLAG_INT (1 << 1) |
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c index c6489b198a99..a6697fd05217 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | |||
@@ -191,8 +191,8 @@ int amdgpu_sync_resv(struct amdgpu_device *adev, | |||
191 | * for other VM updates and moves. | 191 | * for other VM updates and moves. |
192 | */ | 192 | */ |
193 | fence_owner = amdgpu_sync_get_owner(f); | 193 | fence_owner = amdgpu_sync_get_owner(f); |
194 | if ((owner != AMDGPU_FENCE_OWNER_MOVE) && | 194 | if ((owner != AMDGPU_FENCE_OWNER_UNDEFINED) && |
195 | (fence_owner != AMDGPU_FENCE_OWNER_MOVE) && | 195 | (fence_owner != AMDGPU_FENCE_OWNER_UNDEFINED) && |
196 | ((owner == AMDGPU_FENCE_OWNER_VM) != | 196 | ((owner == AMDGPU_FENCE_OWNER_VM) != |
197 | (fence_owner == AMDGPU_FENCE_OWNER_VM))) | 197 | (fence_owner == AMDGPU_FENCE_OWNER_VM))) |
198 | continue; | 198 | continue; |
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index a089e69e9927..81bb8e9fc26d 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | |||
@@ -1041,7 +1041,7 @@ int amdgpu_copy_buffer(struct amdgpu_ring *ring, | |||
1041 | WARN_ON(ib->length_dw > num_dw); | 1041 | WARN_ON(ib->length_dw > num_dw); |
1042 | r = amdgpu_sched_ib_submit_kernel_helper(adev, ring, ib, 1, | 1042 | r = amdgpu_sched_ib_submit_kernel_helper(adev, ring, ib, 1, |
1043 | &amdgpu_vm_free_job, | 1043 | &amdgpu_vm_free_job, |
1044 | AMDGPU_FENCE_OWNER_MOVE, | 1044 | AMDGPU_FENCE_OWNER_UNDEFINED, |
1045 | fence); | 1045 | fence); |
1046 | if (r) | 1046 | if (r) |
1047 | goto error_free; | 1047 | goto error_free; |