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/r100.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/r100.c')
-rw-r--r-- | drivers/gpu/drm/radeon/r100.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c index fb44e7e49083..415b7d8fbba2 100644 --- a/drivers/gpu/drm/radeon/r100.c +++ b/drivers/gpu/drm/radeon/r100.c | |||
@@ -883,7 +883,7 @@ int r100_copy_blit(struct radeon_device *rdev, | |||
883 | uint64_t src_offset, | 883 | uint64_t src_offset, |
884 | uint64_t dst_offset, | 884 | uint64_t dst_offset, |
885 | unsigned num_gpu_pages, | 885 | unsigned num_gpu_pages, |
886 | struct radeon_fence *fence) | 886 | struct radeon_fence **fence) |
887 | { | 887 | { |
888 | struct radeon_ring *ring = &rdev->ring[RADEON_RING_TYPE_GFX_INDEX]; | 888 | struct radeon_ring *ring = &rdev->ring[RADEON_RING_TYPE_GFX_INDEX]; |
889 | uint32_t cur_pages; | 889 | uint32_t cur_pages; |
@@ -947,7 +947,7 @@ int r100_copy_blit(struct radeon_device *rdev, | |||
947 | RADEON_WAIT_HOST_IDLECLEAN | | 947 | RADEON_WAIT_HOST_IDLECLEAN | |
948 | RADEON_WAIT_DMA_GUI_IDLE); | 948 | RADEON_WAIT_DMA_GUI_IDLE); |
949 | if (fence) { | 949 | if (fence) { |
950 | r = radeon_fence_emit(rdev, fence); | 950 | r = radeon_fence_emit(rdev, fence, RADEON_RING_TYPE_GFX_INDEX); |
951 | } | 951 | } |
952 | radeon_ring_unlock_commit(rdev, ring); | 952 | radeon_ring_unlock_commit(rdev, ring); |
953 | return r; | 953 | return r; |