drm/radeon: check return value of radeon_fence_emit
authorPan Bian <bianpan2016@163.com>
Mon, 24 Apr 2017 08:45:51 +0000 (16:45 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 28 Apr 2017 21:33:02 +0000 (17:33 -0400)
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 <christian.koenig@amd.com>
Signed-off-by: Pan Bian <bianpan2016@163.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/radeon/radeon_test.c

index 4fdc7bd..f5e9abf 100644 (file)
@@ -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;