1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/gpu/drm/radeon/cik_sdma.c b/drivers/gpu/drm/radeon/cik_sdma.c
index 89b4afa5041c..72e464c79a88 100644
--- a/drivers/gpu/drm/radeon/cik_sdma.c
+++ b/drivers/gpu/drm/radeon/cik_sdma.c
@@ -562,6 +562,7 @@ int cik_copy_dma(struct radeon_device *rdev,
         r = radeon_fence_emit(rdev, fence, ring->idx);
         if (r) {
                 radeon_ring_unlock_undo(rdev, ring);
+                radeon_semaphore_free(rdev, &sem, NULL);
                 return r;
         }
 
@@ -597,7 +598,7 @@ int cik_sdma_ring_test(struct radeon_device *rdev,
         tmp = 0xCAFEDEAD;
         writel(tmp, ptr);
 
-        r = radeon_ring_lock(rdev, ring, 4);
+        r = radeon_ring_lock(rdev, ring, 5);
         if (r) {
                 DRM_ERROR("radeon: dma failed to lock ring %d (%d).\n", ring->idx, r);
                 return r;