diff mbox

drm/radeon: Fix scratch register leak in IB test.

Message ID 1348129870-11001-1-git-send-email-michel@daenzer.net (mailing list archive)
State New, archived
Headers show

Commit Message

Michel Dänzer Sept. 20, 2012, 8:31 a.m. UTC 
From: Michel Dänzer <michel.daenzer@amd.com>

Restructure the code to jump out via labels instead of directly returning
early. Also make error reporting consistent across all hardware generations.

Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Simon Kitching <skitching@vonos.net>
Reviewed-by: Christian König <christian.koenig@amd.com>
---
 drivers/gpu/drm/radeon/r100.c |   15 +++++++++------
 drivers/gpu/drm/radeon/r600.c |   12 ++++++------
 2 files changed, 15 insertions(+), 12 deletions(-)

Comments

Alex Deucher Sept. 20, 2012, 1:36 p.m. UTC | #1 
On Thu, Sep 20, 2012 at 4:31 AM, Michel Dänzer <michel@daenzer.net> wrote:
> From: Michel Dänzer <michel.daenzer@amd.com>
>
> Restructure the code to jump out via labels instead of directly returning
> early. Also make error reporting consistent across all hardware generations.
>
> Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
> Reviewed-by: Simon Kitching <skitching@vonos.net>
> Reviewed-by: Christian König <christian.koenig@amd.com>

Added to my -next tree.

Alex

> ---
>  drivers/gpu/drm/radeon/r100.c |   15 +++++++++------
>  drivers/gpu/drm/radeon/r600.c |   12 ++++++------
>  2 files changed, 15 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
> index 8acb34f..693e33e 100644
> --- a/drivers/gpu/drm/radeon/r100.c
> +++ b/drivers/gpu/drm/radeon/r100.c
> @@ -3818,7 +3818,8 @@ int r100_ib_test(struct radeon_device *rdev, struct radeon_ring *ring)
>         WREG32(scratch, 0xCAFEDEAD);
>         r = radeon_ib_get(rdev, RADEON_RING_TYPE_GFX_INDEX, &ib, 256);
>         if (r) {
> -               return r;
> +               DRM_ERROR("radeon: failed to get ib (%d).\n", r);
> +               goto free_scratch;
>         }
>         ib.ptr[0] = PACKET0(scratch, 0);
>         ib.ptr[1] = 0xDEADBEEF;
> @@ -3831,13 +3832,13 @@ int r100_ib_test(struct radeon_device *rdev, struct radeon_ring *ring)
>         ib.length_dw = 8;
>         r = radeon_ib_schedule(rdev, &ib, NULL);
>         if (r) {
> -               radeon_scratch_free(rdev, scratch);
> -               radeon_ib_free(rdev, &ib);
> -               return r;
> +               DRM_ERROR("radeon: failed to schedule ib (%d).\n", r);
> +               goto free_ib;
>         }
>         r = radeon_fence_wait(ib.fence, false);
>         if (r) {
> -               return r;
> +               DRM_ERROR("radeon: fence wait failed (%d).\n", r);
> +               goto free_ib;
>         }
>         for (i = 0; i < rdev->usec_timeout; i++) {
>                 tmp = RREG32(scratch);
> @@ -3853,8 +3854,10 @@ int r100_ib_test(struct radeon_device *rdev, struct radeon_ring *ring)
>                           scratch, tmp);
>                 r = -EINVAL;
>         }
> -       radeon_scratch_free(rdev, scratch);
> +free_ib:
>         radeon_ib_free(rdev, &ib);
> +free_scratch:
> +       radeon_scratch_free(rdev, scratch);
>         return r;
>  }
>
> diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
> index d79c639..38b546e 100644
> --- a/drivers/gpu/drm/radeon/r600.c
> +++ b/drivers/gpu/drm/radeon/r600.c
> @@ -2638,7 +2638,7 @@ int r600_ib_test(struct radeon_device *rdev, struct radeon_ring *ring)
>         r = radeon_ib_get(rdev, ring->idx, &ib, 256);
>         if (r) {
>                 DRM_ERROR("radeon: failed to get ib (%d).\n", r);
> -               return r;
> +               goto free_scratch;
>         }
>         ib.ptr[0] = PACKET3(PACKET3_SET_CONFIG_REG, 1);
>         ib.ptr[1] = ((scratch - PACKET3_SET_CONFIG_REG_OFFSET) >> 2);
> @@ -2646,15 +2646,13 @@ int r600_ib_test(struct radeon_device *rdev, struct radeon_ring *ring)
>         ib.length_dw = 3;
>         r = radeon_ib_schedule(rdev, &ib, NULL);
>         if (r) {
> -               radeon_scratch_free(rdev, scratch);
> -               radeon_ib_free(rdev, &ib);
>                 DRM_ERROR("radeon: failed to schedule ib (%d).\n", r);
> -               return r;
> +               goto free_ib;
>         }
>         r = radeon_fence_wait(ib.fence, false);
>         if (r) {
>                 DRM_ERROR("radeon: fence wait failed (%d).\n", r);
> -               return r;
> +               goto free_ib;
>         }
>         for (i = 0; i < rdev->usec_timeout; i++) {
>                 tmp = RREG32(scratch);
> @@ -2669,8 +2667,10 @@ int r600_ib_test(struct radeon_device *rdev, struct radeon_ring *ring)
>                           scratch, tmp);
>                 r = -EINVAL;
>         }
> -       radeon_scratch_free(rdev, scratch);
> +free_ib:
>         radeon_ib_free(rdev, &ib);
> +free_scratch:
> +       radeon_scratch_free(rdev, scratch);
>         return r;
>  }
>
> --
> 1.7.10.4
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
diff mbox

Patch

diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index 8acb34f..693e33e 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -3818,7 +3818,8 @@  int r100_ib_test(struct radeon_device *rdev, struct radeon_ring *ring)
 	WREG32(scratch, 0xCAFEDEAD);
 	r = radeon_ib_get(rdev, RADEON_RING_TYPE_GFX_INDEX, &ib, 256);
 	if (r) {
-		return r;
+		DRM_ERROR("radeon: failed to get ib (%d).\n", r);
+		goto free_scratch;
 	}
 	ib.ptr[0] = PACKET0(scratch, 0);
 	ib.ptr[1] = 0xDEADBEEF;
@@ -3831,13 +3832,13 @@  int r100_ib_test(struct radeon_device *rdev, struct radeon_ring *ring)
 	ib.length_dw = 8;
 	r = radeon_ib_schedule(rdev, &ib, NULL);
 	if (r) {
-		radeon_scratch_free(rdev, scratch);
-		radeon_ib_free(rdev, &ib);
-		return r;
+		DRM_ERROR("radeon: failed to schedule ib (%d).\n", r);
+		goto free_ib;
 	}
 	r = radeon_fence_wait(ib.fence, false);
 	if (r) {
-		return r;
+		DRM_ERROR("radeon: fence wait failed (%d).\n", r);
+		goto free_ib;
 	}
 	for (i = 0; i < rdev->usec_timeout; i++) {
 		tmp = RREG32(scratch);
@@ -3853,8 +3854,10 @@  int r100_ib_test(struct radeon_device *rdev, struct radeon_ring *ring)
 			  scratch, tmp);
 		r = -EINVAL;
 	}
-	radeon_scratch_free(rdev, scratch);
+free_ib:
 	radeon_ib_free(rdev, &ib);
+free_scratch:
+	radeon_scratch_free(rdev, scratch);
 	return r;
 }
 
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index d79c639..38b546e 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -2638,7 +2638,7 @@  int r600_ib_test(struct radeon_device *rdev, struct radeon_ring *ring)
 	r = radeon_ib_get(rdev, ring->idx, &ib, 256);
 	if (r) {
 		DRM_ERROR("radeon: failed to get ib (%d).\n", r);
-		return r;
+		goto free_scratch;
 	}
 	ib.ptr[0] = PACKET3(PACKET3_SET_CONFIG_REG, 1);
 	ib.ptr[1] = ((scratch - PACKET3_SET_CONFIG_REG_OFFSET) >> 2);
@@ -2646,15 +2646,13 @@  int r600_ib_test(struct radeon_device *rdev, struct radeon_ring *ring)
 	ib.length_dw = 3;
 	r = radeon_ib_schedule(rdev, &ib, NULL);
 	if (r) {
-		radeon_scratch_free(rdev, scratch);
-		radeon_ib_free(rdev, &ib);
 		DRM_ERROR("radeon: failed to schedule ib (%d).\n", r);
-		return r;
+		goto free_ib;
 	}
 	r = radeon_fence_wait(ib.fence, false);
 	if (r) {
 		DRM_ERROR("radeon: fence wait failed (%d).\n", r);
-		return r;
+		goto free_ib;
 	}
 	for (i = 0; i < rdev->usec_timeout; i++) {
 		tmp = RREG32(scratch);
@@ -2669,8 +2667,10 @@  int r600_ib_test(struct radeon_device *rdev, struct radeon_ring *ring)
 			  scratch, tmp);
 		r = -EINVAL;
 	}
-	radeon_scratch_free(rdev, scratch);
+free_ib:
 	radeon_ib_free(rdev, &ib);
+free_scratch:
+	radeon_scratch_free(rdev, scratch);
 	return r;
 }