All of lore.kernel.org
 help / color / mirror / Atom feed
* [2.6.36-rc5] DRM resource leak fixes...
@ 2010-09-21 16:55 Daniel J Blueman
  2010-09-22  4:49 ` Alex Deucher
  0 siblings, 1 reply; 2+ messages in thread
From: Daniel J Blueman @ 2010-09-21 16:55 UTC (permalink / raw)
  To: Alex Deucher; +Cc: Linux Kernel

Hi Alex; for your review:

Fix up some indirect and scratch buffer leaks, and correctly release a
buffer object along various error paths.

diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index e817a0b..5a7d6a0 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -3540,9 +3540,9 @@ int r100_ib_test(struct radeon_device *rdev)
 	}
 	WREG32(scratch, 0xCAFEDEAD);
 	r = radeon_ib_get(rdev, &ib);
-	if (r) {
-		return r;
-	}
+	if (r)
+		goto out2;
+
 	ib->ptr[0] = PACKET0(scratch, 0);
 	ib->ptr[1] = 0xDEADBEEF;
 	ib->ptr[2] = PACKET2(0);
@@ -3553,15 +3553,13 @@ int r100_ib_test(struct radeon_device *rdev)
 	ib->ptr[7] = PACKET2(0);
 	ib->length_dw = 8;
 	r = radeon_ib_schedule(rdev, ib);
-	if (r) {
-		radeon_scratch_free(rdev, scratch);
-		radeon_ib_free(rdev, &ib);
-		return r;
-	}
+	if (r)
+		goto out1;
+
 	r = radeon_fence_wait(ib->fence, false);
-	if (r) {
-		return r;
-	}
+	if (r)
+		goto out1;
+
 	for (i = 0; i < rdev->usec_timeout; i++) {
 		tmp = RREG32(scratch);
 		if (tmp == 0xDEADBEEF) {
@@ -3576,8 +3574,10 @@ int r100_ib_test(struct radeon_device *rdev)
 			  scratch, tmp);
 		r = -EINVAL;
 	}
-	radeon_scratch_free(rdev, scratch);
+out1:
 	radeon_ib_free(rdev, &ib);
+out2:
+	radeon_scratch_free(rdev, scratch);
 	return r;
 }

diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index afc18d8..bfdfa3e 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -2689,7 +2689,7 @@ int r600_ib_test(struct radeon_device *rdev)
 	r = radeon_ib_get(rdev, &ib);
 	if (r) {
 		DRM_ERROR("radeon: failed to get ib (%d).\n", r);
-		return r;
+		goto out2;
 	}
 	ib->ptr[0] = PACKET3(PACKET3_SET_CONFIG_REG, 1);
 	ib->ptr[1] = ((scratch - PACKET3_SET_CONFIG_REG_OFFSET) >> 2);
@@ -2710,15 +2710,13 @@ int r600_ib_test(struct radeon_device *rdev)
 	ib->length_dw = 16;
 	r = radeon_ib_schedule(rdev, ib);
 	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 out1;
 	}
 	r = radeon_fence_wait(ib->fence, false);
 	if (r) {
 		DRM_ERROR("radeon: fence wait failed (%d).\n", r);
-		return r;
+		goto out1;
 	}
 	for (i = 0; i < rdev->usec_timeout; i++) {
 		tmp = RREG32(scratch);
@@ -2733,8 +2731,10 @@ int r600_ib_test(struct radeon_device *rdev)
 			  scratch, tmp);
 		r = -EINVAL;
 	}
-	radeon_scratch_free(rdev, scratch);
+out1:
 	radeon_ib_free(rdev, &ib);
+out2:
+	radeon_scratch_free(rdev, scratch);
 	return r;
 }

diff --git a/drivers/gpu/drm/radeon/r600_blit_kms.c
b/drivers/gpu/drm/radeon/r600_blit_kms.c
index d13622a..e532a81 100644
--- a/drivers/gpu/drm/radeon/r600_blit_kms.c
+++ b/drivers/gpu/drm/radeon/r600_blit_kms.c
@@ -492,6 +492,7 @@ int r600_blit_init(struct radeon_device *rdev)
 	r = radeon_bo_kmap(rdev->r600_blit.shader_obj, &ptr);
 	if (r) {
 		DRM_ERROR("failed to map blit object %d\n", r);
+		radeon_bo_unreserve(rdev->r600_blit.shader_obj);
 		return r;
 	}
 	if (rdev->family >= CHIP_RV770)
-- 
Daniel J Blueman

^ permalink raw reply related	[flat|nested] 2+ messages in thread
* Re: [2.6.36-rc5] DRM resource leak fixes...
  2010-09-21 16:55 [2.6.36-rc5] DRM resource leak fixes Daniel J Blueman
@ 2010-09-22  4:49 ` Alex Deucher
  0 siblings, 0 replies; 2+ messages in thread
From: Alex Deucher @ 2010-09-22  4:49 UTC (permalink / raw)
  To: Daniel J Blueman; +Cc: Linux Kernel

On Tue, Sep 21, 2010 at 12:55 PM, Daniel J Blueman
<daniel.blueman@gmail.com> wrote:
> Hi Alex; for your review:
>
> Fix up some indirect and scratch buffer leaks, and correctly release a
> buffer object along various error paths.

These look good to me.

Reviewed-by: Alex Deucher <alexdeucher@gmail.com>

>
> diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
> index e817a0b..5a7d6a0 100644
> --- a/drivers/gpu/drm/radeon/r100.c
> +++ b/drivers/gpu/drm/radeon/r100.c
> @@ -3540,9 +3540,9 @@ int r100_ib_test(struct radeon_device *rdev)
>        }
>        WREG32(scratch, 0xCAFEDEAD);
>        r = radeon_ib_get(rdev, &ib);
> -       if (r) {
> -               return r;
> -       }
> +       if (r)
> +               goto out2;
> +
>        ib->ptr[0] = PACKET0(scratch, 0);
>        ib->ptr[1] = 0xDEADBEEF;
>        ib->ptr[2] = PACKET2(0);
> @@ -3553,15 +3553,13 @@ int r100_ib_test(struct radeon_device *rdev)
>        ib->ptr[7] = PACKET2(0);
>        ib->length_dw = 8;
>        r = radeon_ib_schedule(rdev, ib);
> -       if (r) {
> -               radeon_scratch_free(rdev, scratch);
> -               radeon_ib_free(rdev, &ib);
> -               return r;
> -       }
> +       if (r)
> +               goto out1;
> +
>        r = radeon_fence_wait(ib->fence, false);
> -       if (r) {
> -               return r;
> -       }
> +       if (r)
> +               goto out1;
> +
>        for (i = 0; i < rdev->usec_timeout; i++) {
>                tmp = RREG32(scratch);
>                if (tmp == 0xDEADBEEF) {
> @@ -3576,8 +3574,10 @@ int r100_ib_test(struct radeon_device *rdev)
>                          scratch, tmp);
>                r = -EINVAL;
>        }
> -       radeon_scratch_free(rdev, scratch);
> +out1:
>        radeon_ib_free(rdev, &ib);
> +out2:
> +       radeon_scratch_free(rdev, scratch);
>        return r;
>  }
>
> diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
> index afc18d8..bfdfa3e 100644
> --- a/drivers/gpu/drm/radeon/r600.c
> +++ b/drivers/gpu/drm/radeon/r600.c
> @@ -2689,7 +2689,7 @@ int r600_ib_test(struct radeon_device *rdev)
>        r = radeon_ib_get(rdev, &ib);
>        if (r) {
>                DRM_ERROR("radeon: failed to get ib (%d).\n", r);
> -               return r;
> +               goto out2;
>        }
>        ib->ptr[0] = PACKET3(PACKET3_SET_CONFIG_REG, 1);
>        ib->ptr[1] = ((scratch - PACKET3_SET_CONFIG_REG_OFFSET) >> 2);
> @@ -2710,15 +2710,13 @@ int r600_ib_test(struct radeon_device *rdev)
>        ib->length_dw = 16;
>        r = radeon_ib_schedule(rdev, ib);
>        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 out1;
>        }
>        r = radeon_fence_wait(ib->fence, false);
>        if (r) {
>                DRM_ERROR("radeon: fence wait failed (%d).\n", r);
> -               return r;
> +               goto out1;
>        }
>        for (i = 0; i < rdev->usec_timeout; i++) {
>                tmp = RREG32(scratch);
> @@ -2733,8 +2731,10 @@ int r600_ib_test(struct radeon_device *rdev)
>                          scratch, tmp);
>                r = -EINVAL;
>        }
> -       radeon_scratch_free(rdev, scratch);
> +out1:
>        radeon_ib_free(rdev, &ib);
> +out2:
> +       radeon_scratch_free(rdev, scratch);
>        return r;
>  }
>
> diff --git a/drivers/gpu/drm/radeon/r600_blit_kms.c
> b/drivers/gpu/drm/radeon/r600_blit_kms.c
> index d13622a..e532a81 100644
> --- a/drivers/gpu/drm/radeon/r600_blit_kms.c
> +++ b/drivers/gpu/drm/radeon/r600_blit_kms.c
> @@ -492,6 +492,7 @@ int r600_blit_init(struct radeon_device *rdev)
>        r = radeon_bo_kmap(rdev->r600_blit.shader_obj, &ptr);
>        if (r) {
>                DRM_ERROR("failed to map blit object %d\n", r);
> +               radeon_bo_unreserve(rdev->r600_blit.shader_obj);
>                return r;
>        }
>        if (rdev->family >= CHIP_RV770)
> --
> Daniel J Blueman
>

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-09-22  4:49 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-09-21 16:55 [2.6.36-rc5] DRM resource leak fixes Daniel J Blueman
2010-09-22  4:49 ` Alex Deucher

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.