aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/radeon_test.c
diff options
context:
space:
mode:
authorChristian König <deathsimple@vodafone.de>2012-05-10 10:46:43 -0400
committerChristian König <deathsimple@vodafone.de>2012-06-21 03:38:40 -0400
commit220907d9835ce5181b9f782c862b1ee7a4d24c23 (patch)
tree0b06da4048162f72b2bb677d3a9686571f7be26d /drivers/gpu/drm/radeon/radeon_test.c
parent68e250b7c281dbb75ea2a892a7d4ca27f974fc91 (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_test.c')
-rw-r--r--drivers/gpu/drm/radeon/radeon_test.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_test.c b/drivers/gpu/drm/radeon/radeon_test.c
index 47e1535f2706..a94f66fb3b13 100644
--- a/drivers/gpu/drm/radeon/radeon_test.c
+++ b/drivers/gpu/drm/radeon/radeon_test.c
@@ -303,8 +303,7 @@ void radeon_test_ring_sync(struct radeon_device *rdev,
303 } 303 }
304 304
305out_cleanup: 305out_cleanup:
306 if (semaphore) 306 radeon_semaphore_free(rdev, &semaphore, NULL);
307 radeon_semaphore_free(rdev, semaphore, NULL);
308 307
309 if (fence1) 308 if (fence1)
310 radeon_fence_unref(&fence1); 309 radeon_fence_unref(&fence1);
@@ -422,8 +421,7 @@ void radeon_test_ring_sync2(struct radeon_device *rdev,
422 } 421 }
423 422
424out_cleanup: 423out_cleanup:
425 if (semaphore) 424 radeon_semaphore_free(rdev, &semaphore, NULL);
426 radeon_semaphore_free(rdev, semaphore, NULL);
427 425
428 if (fenceA) 426 if (fenceA)
429 radeon_fence_unref(&fenceA); 427 radeon_fence_unref(&fenceA);