diff options
author | Christian König <deathsimple@vodafone.de> | 2012-05-08 08:24:01 -0400 |
---|---|---|
committer | Christian König <deathsimple@vodafone.de> | 2012-06-21 03:38:35 -0400 |
commit | 876dc9f32907e57e0298bcd0f1607cb7a2582f63 (patch) | |
tree | e7bd45fff5d2ddff8c8805ee83116e02b75d2a6a /drivers/gpu/drm/radeon/r600_blit_kms.c | |
parent | 9c19415c233499c26081798b880910ec0e1d7bad (diff) |
drm/radeon: remove radeon_fence_create
It is completely unnecessary to create fences
before they are emitted, so remove it and a bunch
of checks if fences are emitted or not.
Signed-off-by: Christian König <deathsimple@vodafone.de>
Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/r600_blit_kms.c')
-rw-r--r-- | drivers/gpu/drm/radeon/r600_blit_kms.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/r600_blit_kms.c b/drivers/gpu/drm/radeon/r600_blit_kms.c index 03b6e0d3d503..02f4eebf805f 100644 --- a/drivers/gpu/drm/radeon/r600_blit_kms.c +++ b/drivers/gpu/drm/radeon/r600_blit_kms.c | |||
@@ -703,20 +703,20 @@ int r600_blit_prepare_copy(struct radeon_device *rdev, unsigned num_gpu_pages, | |||
703 | return 0; | 703 | return 0; |
704 | } | 704 | } |
705 | 705 | ||
706 | void r600_blit_done_copy(struct radeon_device *rdev, struct radeon_fence *fence, | 706 | void r600_blit_done_copy(struct radeon_device *rdev, struct radeon_fence **fence, |
707 | struct radeon_sa_bo *vb) | 707 | struct radeon_sa_bo *vb) |
708 | { | 708 | { |
709 | struct radeon_ring *ring = &rdev->ring[RADEON_RING_TYPE_GFX_INDEX]; | 709 | struct radeon_ring *ring = &rdev->ring[RADEON_RING_TYPE_GFX_INDEX]; |
710 | int r; | 710 | int r; |
711 | 711 | ||
712 | r = radeon_fence_emit(rdev, fence); | 712 | r = radeon_fence_emit(rdev, fence, RADEON_RING_TYPE_GFX_INDEX); |
713 | if (r) { | 713 | if (r) { |
714 | radeon_ring_unlock_undo(rdev, ring); | 714 | radeon_ring_unlock_undo(rdev, ring); |
715 | return; | 715 | return; |
716 | } | 716 | } |
717 | 717 | ||
718 | radeon_ring_unlock_commit(rdev, ring); | 718 | radeon_ring_unlock_commit(rdev, ring); |
719 | radeon_sa_bo_free(rdev, &vb, fence); | 719 | radeon_sa_bo_free(rdev, &vb, *fence); |
720 | } | 720 | } |
721 | 721 | ||
722 | void r600_kms_blit_copy(struct radeon_device *rdev, | 722 | void r600_kms_blit_copy(struct radeon_device *rdev, |