diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-12-16 14:51:32 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-12-16 14:51:32 +0100 |
| commit | fe361cfcf40ad4612226347573a8669cd0d44799 (patch) | |
| tree | e874ef5a29c3bfe3dd67dc2d8962562c00fc8e3a /drivers/gpu/drm/radeon/evergreen_dma.c | |
| parent | perf: Optimize ring-buffer write by depending on control dependencies (diff) | |
| parent | Linux 3.13-rc4 (diff) | |
| download | linux-fe361cfcf40ad4612226347573a8669cd0d44799.tar.xz linux-fe361cfcf40ad4612226347573a8669cd0d44799.zip | |
Merge tag 'v3.13-rc4' into perf/core
Merge Linux 3.13-rc4, to refresh this branch with the latest fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/radeon/evergreen_dma.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/evergreen_dma.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/gpu/drm/radeon/evergreen_dma.c b/drivers/gpu/drm/radeon/evergreen_dma.c index 6a0656d00ed0..a37b54436382 100644 --- a/drivers/gpu/drm/radeon/evergreen_dma.c +++ b/drivers/gpu/drm/radeon/evergreen_dma.c @@ -131,13 +131,8 @@ int evergreen_copy_dma(struct radeon_device *rdev, return r; } - if (radeon_fence_need_sync(*fence, ring->idx)) { - radeon_semaphore_sync_rings(rdev, sem, (*fence)->ring, - ring->idx); - radeon_fence_note_sync(*fence, ring->idx); - } else { - radeon_semaphore_free(rdev, &sem, NULL); - } + radeon_semaphore_sync_to(sem, *fence); + radeon_semaphore_sync_rings(rdev, sem, ring->idx); for (i = 0; i < num_loops; i++) { cur_size_in_dw = size_in_dw; |