drm/radeon: check return value of radeon_fence_emit

Function radeon_fence_emit() returns -ENOMEM if there is no enough
memory. And in this case, function radeon_ring_unlock_undo() rather than
function radeon_ring_unlock_commit() should be called. However, in
function radeon_test_create_and_emit_fence(), the return value of
radeon_fence_emit() is ignored. This patch adds the check.

Reviewed-by: Christian König <[email protected]>
Signed-off-by: Pan Bian <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>

diff --git a/drivers/gpu/drm/radeon/radeon_test.c b/drivers/gpu/drm/radeon/radeon_test.c
index 4fdc7bda7a7d5c85612b51c0630014e365d6a1e9..f5e9abfadb560879ad98e889987e031ac9f1379b 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_test.c
+++ b/drivers/gpu/drm/radeon/radeon_test.c
@@ -298,7 +298,12 @@ static int radeon_test_create_and_emit_fence(struct radeon_device *rdev,
                        DRM_ERROR("Failed to lock ring A %d\n", ring->idx);
                        return r;
                }
-               radeon_fence_emit(rdev, fence, ring->idx);
+               r = radeon_fence_emit(rdev, fence, ring->idx);
+               if (r) {
+                       DRM_ERROR("Failed to emit fence\n");
+                       radeon_ring_unlock_undo(rdev, ring);
+                       return r;
+               }
                radeon_ring_unlock_commit(rdev, ring, false);
        }
        return 0;