diff options
author | Christian König <deathsimple@vodafone.de> | 2012-05-10 10:46:43 -0400 |
---|---|---|
committer | Christian König <deathsimple@vodafone.de> | 2012-06-21 03:38:40 -0400 |
commit | 220907d9835ce5181b9f782c862b1ee7a4d24c23 (patch) | |
tree | 0b06da4048162f72b2bb677d3a9686571f7be26d /drivers/gpu/drm/radeon/radeon_asic.h | |
parent | 68e250b7c281dbb75ea2a892a7d4ca27f974fc91 (diff) |
drm/radeon: rework ring syncing code
Move inter ring syncing with semaphores into the
existing ring allocations, with that we need to
lock the ring mutex only once.
Signed-off-by: Christian König <deathsimple@vodafone.de>
Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_asic.h')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_asic.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h index 8cdf075aacfd..94c427ab0f5c 100644 --- a/drivers/gpu/drm/radeon/radeon_asic.h +++ b/drivers/gpu/drm/radeon/radeon_asic.h | |||
@@ -363,9 +363,10 @@ int r600_hdmi_buffer_status_changed(struct drm_encoder *encoder); | |||
363 | void r600_hdmi_update_audio_settings(struct drm_encoder *encoder); | 363 | void r600_hdmi_update_audio_settings(struct drm_encoder *encoder); |
364 | /* r600 blit */ | 364 | /* r600 blit */ |
365 | int r600_blit_prepare_copy(struct radeon_device *rdev, unsigned num_gpu_pages, | 365 | int r600_blit_prepare_copy(struct radeon_device *rdev, unsigned num_gpu_pages, |
366 | struct radeon_sa_bo **vb); | 366 | struct radeon_fence **fence, struct radeon_sa_bo **vb, |
367 | struct radeon_semaphore **sem); | ||
367 | void r600_blit_done_copy(struct radeon_device *rdev, struct radeon_fence **fence, | 368 | void r600_blit_done_copy(struct radeon_device *rdev, struct radeon_fence **fence, |
368 | struct radeon_sa_bo *vb); | 369 | struct radeon_sa_bo *vb, struct radeon_semaphore *sem); |
369 | void r600_kms_blit_copy(struct radeon_device *rdev, | 370 | void r600_kms_blit_copy(struct radeon_device *rdev, |
370 | u64 src_gpu_addr, u64 dst_gpu_addr, | 371 | u64 src_gpu_addr, u64 dst_gpu_addr, |
371 | unsigned num_gpu_pages, | 372 | unsigned num_gpu_pages, |