aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu.h
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2015-08-20 02:47:40 -0400
committerAlex Deucher <alexander.deucher@amd.com>2015-08-25 10:39:39 -0400
commitf91b3a69418120974c9a416939b903ec86607c52 (patch)
tree37d38ee8df8c9e8f308f95dcc79cdd8099e77319 /drivers/gpu/drm/amd/amdgpu/amdgpu.h
parentc746ba222363d2e0b0316b1c0bda21e2646b66f2 (diff)
drm/amdgpu: fix fence wait in sync_fence, instead should be in sync_rings
Signed-off-by: Christian König <christian.koenig@amd.com> Signed-off-by: Chunming Zhou <david1.zhou@amd.com> Reviewed-by: Christian K?nig <christian.koenig@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu.h')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 65e0e9406abb..3c5487257ef0 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -704,6 +704,7 @@ void amdgpu_semaphore_free(struct amdgpu_device *adev,
704struct amdgpu_sync { 704struct amdgpu_sync {
705 struct amdgpu_semaphore *semaphores[AMDGPU_NUM_SYNCS]; 705 struct amdgpu_semaphore *semaphores[AMDGPU_NUM_SYNCS];
706 struct amdgpu_fence *sync_to[AMDGPU_MAX_RINGS]; 706 struct amdgpu_fence *sync_to[AMDGPU_MAX_RINGS];
707 DECLARE_HASHTABLE(fences, 4);
707 struct amdgpu_fence *last_vm_update; 708 struct amdgpu_fence *last_vm_update;
708}; 709};
709 710
@@ -716,6 +717,7 @@ int amdgpu_sync_resv(struct amdgpu_device *adev,
716 void *owner); 717 void *owner);
717int amdgpu_sync_rings(struct amdgpu_sync *sync, 718int amdgpu_sync_rings(struct amdgpu_sync *sync,
718 struct amdgpu_ring *ring); 719 struct amdgpu_ring *ring);
720int amdgpu_sync_wait(struct amdgpu_sync *sync);
719void amdgpu_sync_free(struct amdgpu_device *adev, struct amdgpu_sync *sync, 721void amdgpu_sync_free(struct amdgpu_device *adev, struct amdgpu_sync *sync,
720 struct fence *fence); 722 struct fence *fence);
721 723