diff options
author | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2014-09-25 06:39:38 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2014-10-03 09:19:16 -0400 |
commit | 392a250bd080e296f97ccc7e91b051a6b5da0ff1 (patch) | |
tree | 9c945db20239a93068c5d6d0b26efda883e6ba24 /drivers/gpu/drm/radeon/radeon.h | |
parent | a0e847641cd7239661ff1b39db0afb0e2992026f (diff) |
drm/radeon: cope with foreign fences inside the reservation object
Not the whole world is a radeon! :-)
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon.h')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index 06d24b85003e..e01424fe2848 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h | |||
@@ -589,9 +589,10 @@ bool radeon_semaphore_emit_wait(struct radeon_device *rdev, int ring, | |||
589 | struct radeon_semaphore *semaphore); | 589 | struct radeon_semaphore *semaphore); |
590 | void radeon_semaphore_sync_fence(struct radeon_semaphore *semaphore, | 590 | void radeon_semaphore_sync_fence(struct radeon_semaphore *semaphore, |
591 | struct radeon_fence *fence); | 591 | struct radeon_fence *fence); |
592 | void radeon_semaphore_sync_resv(struct radeon_semaphore *semaphore, | 592 | int radeon_semaphore_sync_resv(struct radeon_device *rdev, |
593 | struct reservation_object *resv, | 593 | struct radeon_semaphore *semaphore, |
594 | bool shared); | 594 | struct reservation_object *resv, |
595 | bool shared); | ||
595 | int radeon_semaphore_sync_rings(struct radeon_device *rdev, | 596 | int radeon_semaphore_sync_rings(struct radeon_device *rdev, |
596 | struct radeon_semaphore *semaphore, | 597 | struct radeon_semaphore *semaphore, |
597 | int waiting_ring); | 598 | int waiting_ring); |