diff options
author | Chunming Zhou <david1.zhou@amd.com> | 2015-08-19 04:41:19 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2015-08-25 10:38:41 -0400 |
commit | 4ce9891ee17c6e064cc334e3297f7e992d47f3a6 (patch) | |
tree | 402cc36ef6e4db0fc0158ae9cdcee6e9e7ff2445 /drivers/gpu/drm/amd/amdgpu/amdgpu.h | |
parent | 1aa4051b7f5474cca6009c13868c59d78d06f983 (diff) |
drm/amdgpu: improve sa_bo->fence by kernel fence
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.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index 4addac5f6763..80f2ceaf6af6 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h | |||
@@ -441,7 +441,7 @@ int amdgpu_fence_wait_empty(struct amdgpu_ring *ring); | |||
441 | unsigned amdgpu_fence_count_emitted(struct amdgpu_ring *ring); | 441 | unsigned amdgpu_fence_count_emitted(struct amdgpu_ring *ring); |
442 | 442 | ||
443 | signed long amdgpu_fence_wait_multiple(struct amdgpu_device *adev, | 443 | signed long amdgpu_fence_wait_multiple(struct amdgpu_device *adev, |
444 | struct amdgpu_fence **array, | 444 | struct fence **array, |
445 | uint32_t count, | 445 | uint32_t count, |
446 | bool wait_all, | 446 | bool wait_all, |
447 | bool intr, | 447 | bool intr, |
@@ -654,7 +654,7 @@ struct amdgpu_sa_bo { | |||
654 | struct amdgpu_sa_manager *manager; | 654 | struct amdgpu_sa_manager *manager; |
655 | unsigned soffset; | 655 | unsigned soffset; |
656 | unsigned eoffset; | 656 | unsigned eoffset; |
657 | struct amdgpu_fence *fence; | 657 | struct fence *fence; |
658 | }; | 658 | }; |
659 | 659 | ||
660 | /* | 660 | /* |
@@ -696,7 +696,7 @@ bool amdgpu_semaphore_emit_wait(struct amdgpu_ring *ring, | |||
696 | struct amdgpu_semaphore *semaphore); | 696 | struct amdgpu_semaphore *semaphore); |
697 | void amdgpu_semaphore_free(struct amdgpu_device *adev, | 697 | void amdgpu_semaphore_free(struct amdgpu_device *adev, |
698 | struct amdgpu_semaphore **semaphore, | 698 | struct amdgpu_semaphore **semaphore, |
699 | struct amdgpu_fence *fence); | 699 | struct fence *fence); |
700 | 700 | ||
701 | /* | 701 | /* |
702 | * Synchronization | 702 | * Synchronization |
@@ -717,7 +717,7 @@ int amdgpu_sync_resv(struct amdgpu_device *adev, | |||
717 | int amdgpu_sync_rings(struct amdgpu_sync *sync, | 717 | int amdgpu_sync_rings(struct amdgpu_sync *sync, |
718 | struct amdgpu_ring *ring); | 718 | struct amdgpu_ring *ring); |
719 | void amdgpu_sync_free(struct amdgpu_device *adev, struct amdgpu_sync *sync, | 719 | void amdgpu_sync_free(struct amdgpu_device *adev, struct amdgpu_sync *sync, |
720 | struct amdgpu_fence *fence); | 720 | struct fence *fence); |
721 | 721 | ||
722 | /* | 722 | /* |
723 | * GART structures, functions & helpers | 723 | * GART structures, functions & helpers |