2017-04-23 13:52:02

by Pan Bian

Subject: [PATCH 1/1] drm/radeon: check return vlaue of radeon_fence_emit

From: Pan Bian <[email protected]>

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.

Signed-off-by: Pan Bian <[email protected]>
---
drivers/gpu/drm/radeon/radeon_test.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/radeon/radeon_test.c b/drivers/gpu/drm/radeon/radeon_test.c
index 79181816..7a44703 100644
--- a/drivers/gpu/drm/radeon/radeon_test.c
+++ b/drivers/gpu/drm/radeon/radeon_test.c
@@ -298,7 +298,11 @@ 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) {
+ radeon_ring_unlock_undo(rdev, ring);
+ return r;
+ }
radeon_ring_unlock_commit(rdev, ring, false);
}
return 0;
--
1.9.1

2017-04-24 07:49:34

by Christian König

Subject: Re: [PATCH 1/1] drm/radeon: check return vlaue of radeon_fence_emit

Am 23.04.2017 um 15:50 schrieb Pan Bian:
> From: Pan Bian <[email protected]>
>
> 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.
>
> Signed-off-by: Pan Bian <[email protected]>
> ---
> drivers/gpu/drm/radeon/radeon_test.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_test.c b/drivers/gpu/drm/radeon/radeon_test.c
> index 79181816..7a44703 100644
> --- a/drivers/gpu/drm/radeon/radeon_test.c
> +++ b/drivers/gpu/drm/radeon/radeon_test.c
> @@ -298,7 +298,11 @@ 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) {
> + radeon_ring_unlock_undo(rdev, ring);

Please add a DRM_ERROR() here as well.

Apart from that it looks good to me.

Christian.

> + return r;
> + }
> radeon_ring_unlock_commit(rdev, ring, false);
> }
> return 0;