All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/radeon: drm/radeon: add missing radeon_semaphore_free to error path
@ 2014-04-24 11:29 Maarten Lankhorst
  2014-04-26  1:39 ` Dieter Nützel
  2014-04-28 14:19 ` Alex Deucher
  0 siblings, 2 replies; 3+ messages in thread
From: Maarten Lankhorst @ 2014-04-24 11:29 UTC (permalink / raw)
  To: dri-devel@lists.freedesktop.org

It would appear this bug has been copy/pasted many times without being noticed.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
---
diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
index f58a07c26b86..0e071571a4c6 100644
--- a/drivers/gpu/drm/radeon/cik.c
+++ b/drivers/gpu/drm/radeon/cik.c
@@ -3670,6 +3670,7 @@ int cik_copy_cpdma(struct radeon_device *rdev,
  	r = radeon_fence_emit(rdev, fence, ring->idx);
  	if (r) {
  		radeon_ring_unlock_undo(rdev, ring);
+		radeon_semaphore_free(rdev, &sem, NULL);
  		return r;
  	}
  
diff --git a/drivers/gpu/drm/radeon/cik_sdma.c b/drivers/gpu/drm/radeon/cik_sdma.c
index 94626ea90fa5..06ca19cf5446 100644
--- a/drivers/gpu/drm/radeon/cik_sdma.c
+++ b/drivers/gpu/drm/radeon/cik_sdma.c
@@ -564,6 +564,7 @@ int cik_copy_dma(struct radeon_device *rdev,
  	r = radeon_fence_emit(rdev, fence, ring->idx);
  	if (r) {
  		radeon_ring_unlock_undo(rdev, ring);
+		radeon_semaphore_free(rdev, &sem, NULL);
  		return r;
  	}
  
diff --git a/drivers/gpu/drm/radeon/evergreen_dma.c b/drivers/gpu/drm/radeon/evergreen_dma.c
index a37b54436382..e6b8c752e42c 100644
--- a/drivers/gpu/drm/radeon/evergreen_dma.c
+++ b/drivers/gpu/drm/radeon/evergreen_dma.c
@@ -151,6 +151,7 @@ int evergreen_copy_dma(struct radeon_device *rdev,
  	r = radeon_fence_emit(rdev, fence, ring->idx);
  	if (r) {
  		radeon_ring_unlock_undo(rdev, ring);
+		radeon_semaphore_free(rdev, &sem, NULL);
  		return r;
  	}
  
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index 7a4ee41c7cab..fc9568547a97 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -2843,6 +2843,7 @@ int r600_copy_cpdma(struct radeon_device *rdev,
  	r = radeon_fence_emit(rdev, fence, ring->idx);
  	if (r) {
  		radeon_ring_unlock_undo(rdev, ring);
+		radeon_semaphore_free(rdev, &sem, NULL);
  		return r;
  	}
  
diff --git a/drivers/gpu/drm/radeon/r600_dma.c b/drivers/gpu/drm/radeon/r600_dma.c
index b2d4c91e6272..2590e2289303 100644
--- a/drivers/gpu/drm/radeon/r600_dma.c
+++ b/drivers/gpu/drm/radeon/r600_dma.c
@@ -493,6 +493,7 @@ int r600_copy_dma(struct radeon_device *rdev,
  	r = radeon_fence_emit(rdev, fence, ring->idx);
  	if (r) {
  		radeon_ring_unlock_undo(rdev, ring);
+		radeon_semaphore_free(rdev, &sem, NULL);
  		return r;
  	}
  
diff --git a/drivers/gpu/drm/radeon/rv770_dma.c b/drivers/gpu/drm/radeon/rv770_dma.c
index aca8cbe8a335..bbf2e076ee45 100644
--- a/drivers/gpu/drm/radeon/rv770_dma.c
+++ b/drivers/gpu/drm/radeon/rv770_dma.c
@@ -86,6 +86,7 @@ int rv770_copy_dma(struct radeon_device *rdev,
  	r = radeon_fence_emit(rdev, fence, ring->idx);
  	if (r) {
  		radeon_ring_unlock_undo(rdev, ring);
+		radeon_semaphore_free(rdev, &sem, NULL);
  		return r;
  	}
  
diff --git a/drivers/gpu/drm/radeon/si_dma.c b/drivers/gpu/drm/radeon/si_dma.c
index 59be2cfcbb47..e61ab2d7da41 100644
--- a/drivers/gpu/drm/radeon/si_dma.c
+++ b/drivers/gpu/drm/radeon/si_dma.c
@@ -215,6 +215,7 @@ int si_copy_dma(struct radeon_device *rdev,
  	r = radeon_fence_emit(rdev, fence, ring->idx);
  	if (r) {
  		radeon_ring_unlock_undo(rdev, ring);
+		radeon_semaphore_free(rdev, &sem, NULL);
  		return r;
  	}

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH] drm/radeon: drm/radeon: add missing radeon_semaphore_free to error path
  2014-04-24 11:29 [PATCH] drm/radeon: drm/radeon: add missing radeon_semaphore_free to error path Maarten Lankhorst
@ 2014-04-26  1:39 ` Dieter Nützel
  2014-04-28 14:19 ` Alex Deucher
  1 sibling, 0 replies; 3+ messages in thread
From: Dieter Nützel @ 2014-04-26  1:39 UTC (permalink / raw)
  To: Maarten Lankhorst; +Cc: dri-devel

Tested-by for RV730 (r600.c).

Am 24.04.2014 13:29, schrieb Maarten Lankhorst:
> It would appear this bug has been copy/pasted many times without being 
> noticed.
> 
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
> ---
> diff --git a/drivers/gpu/drm/radeon/cik.c 
> b/drivers/gpu/drm/radeon/cik.c
> index f58a07c26b86..0e071571a4c6 100644
> --- a/drivers/gpu/drm/radeon/cik.c
> +++ b/drivers/gpu/drm/radeon/cik.c
> @@ -3670,6 +3670,7 @@ int cik_copy_cpdma(struct radeon_device *rdev,
>  	r = radeon_fence_emit(rdev, fence, ring->idx);
>  	if (r) {
>  		radeon_ring_unlock_undo(rdev, ring);
> +		radeon_semaphore_free(rdev, &sem, NULL);
>  		return r;
>  	}
>  diff --git a/drivers/gpu/drm/radeon/cik_sdma.c
> b/drivers/gpu/drm/radeon/cik_sdma.c
> index 94626ea90fa5..06ca19cf5446 100644
> --- a/drivers/gpu/drm/radeon/cik_sdma.c
> +++ b/drivers/gpu/drm/radeon/cik_sdma.c
> @@ -564,6 +564,7 @@ int cik_copy_dma(struct radeon_device *rdev,
>  	r = radeon_fence_emit(rdev, fence, ring->idx);
>  	if (r) {
>  		radeon_ring_unlock_undo(rdev, ring);
> +		radeon_semaphore_free(rdev, &sem, NULL);
>  		return r;
>  	}
>  diff --git a/drivers/gpu/drm/radeon/evergreen_dma.c
> b/drivers/gpu/drm/radeon/evergreen_dma.c
> index a37b54436382..e6b8c752e42c 100644
> --- a/drivers/gpu/drm/radeon/evergreen_dma.c
> +++ b/drivers/gpu/drm/radeon/evergreen_dma.c
> @@ -151,6 +151,7 @@ int evergreen_copy_dma(struct radeon_device *rdev,
>  	r = radeon_fence_emit(rdev, fence, ring->idx);
>  	if (r) {
>  		radeon_ring_unlock_undo(rdev, ring);
> +		radeon_semaphore_free(rdev, &sem, NULL);
>  		return r;
>  	}
>  diff --git a/drivers/gpu/drm/radeon/r600.c 
> b/drivers/gpu/drm/radeon/r600.c
> index 7a4ee41c7cab..fc9568547a97 100644
> --- a/drivers/gpu/drm/radeon/r600.c
> +++ b/drivers/gpu/drm/radeon/r600.c
> @@ -2843,6 +2843,7 @@ int r600_copy_cpdma(struct radeon_device *rdev,
>  	r = radeon_fence_emit(rdev, fence, ring->idx);
>  	if (r) {
>  		radeon_ring_unlock_undo(rdev, ring);
> +		radeon_semaphore_free(rdev, &sem, NULL);
>  		return r;
>  	}
>  diff --git a/drivers/gpu/drm/radeon/r600_dma.c
> b/drivers/gpu/drm/radeon/r600_dma.c
> index b2d4c91e6272..2590e2289303 100644
> --- a/drivers/gpu/drm/radeon/r600_dma.c
> +++ b/drivers/gpu/drm/radeon/r600_dma.c
> @@ -493,6 +493,7 @@ int r600_copy_dma(struct radeon_device *rdev,
>  	r = radeon_fence_emit(rdev, fence, ring->idx);
>  	if (r) {
>  		radeon_ring_unlock_undo(rdev, ring);
> +		radeon_semaphore_free(rdev, &sem, NULL);
>  		return r;
>  	}
>  diff --git a/drivers/gpu/drm/radeon/rv770_dma.c
> b/drivers/gpu/drm/radeon/rv770_dma.c
> index aca8cbe8a335..bbf2e076ee45 100644
> --- a/drivers/gpu/drm/radeon/rv770_dma.c
> +++ b/drivers/gpu/drm/radeon/rv770_dma.c
> @@ -86,6 +86,7 @@ int rv770_copy_dma(struct radeon_device *rdev,
>  	r = radeon_fence_emit(rdev, fence, ring->idx);
>  	if (r) {
>  		radeon_ring_unlock_undo(rdev, ring);
> +		radeon_semaphore_free(rdev, &sem, NULL);
>  		return r;
>  	}
>  diff --git a/drivers/gpu/drm/radeon/si_dma.c 
> b/drivers/gpu/drm/radeon/si_dma.c
> index 59be2cfcbb47..e61ab2d7da41 100644
> --- a/drivers/gpu/drm/radeon/si_dma.c
> +++ b/drivers/gpu/drm/radeon/si_dma.c
> @@ -215,6 +215,7 @@ int si_copy_dma(struct radeon_device *rdev,
>  	r = radeon_fence_emit(rdev, fence, ring->idx);
>  	if (r) {
>  		radeon_ring_unlock_undo(rdev, ring);
> +		radeon_semaphore_free(rdev, &sem, NULL);
>  		return r;
>  	}
> 
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [PATCH] drm/radeon: drm/radeon: add missing radeon_semaphore_free to error path
  2014-04-24 11:29 [PATCH] drm/radeon: drm/radeon: add missing radeon_semaphore_free to error path Maarten Lankhorst
  2014-04-26  1:39 ` Dieter Nützel
@ 2014-04-28 14:19 ` Alex Deucher
  1 sibling, 0 replies; 3+ messages in thread
From: Alex Deucher @ 2014-04-28 14:19 UTC (permalink / raw)
  To: Maarten Lankhorst; +Cc: dri-devel@lists.freedesktop.org

On Thu, Apr 24, 2014 at 7:29 AM, Maarten Lankhorst
<maarten.lankhorst@canonical.com> wrote:
> It would appear this bug has been copy/pasted many times without being
> noticed.
>
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

> ---
> diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
> index f58a07c26b86..0e071571a4c6 100644
> --- a/drivers/gpu/drm/radeon/cik.c
> +++ b/drivers/gpu/drm/radeon/cik.c
> @@ -3670,6 +3670,7 @@ int cik_copy_cpdma(struct radeon_device *rdev,
>         r = radeon_fence_emit(rdev, fence, ring->idx);
>         if (r) {
>                 radeon_ring_unlock_undo(rdev, ring);
> +               radeon_semaphore_free(rdev, &sem, NULL);
>                 return r;
>         }
>  diff --git a/drivers/gpu/drm/radeon/cik_sdma.c
> b/drivers/gpu/drm/radeon/cik_sdma.c
> index 94626ea90fa5..06ca19cf5446 100644
> --- a/drivers/gpu/drm/radeon/cik_sdma.c
> +++ b/drivers/gpu/drm/radeon/cik_sdma.c
> @@ -564,6 +564,7 @@ int cik_copy_dma(struct radeon_device *rdev,
>         r = radeon_fence_emit(rdev, fence, ring->idx);
>         if (r) {
>                 radeon_ring_unlock_undo(rdev, ring);
> +               radeon_semaphore_free(rdev, &sem, NULL);
>                 return r;
>         }
>  diff --git a/drivers/gpu/drm/radeon/evergreen_dma.c
> b/drivers/gpu/drm/radeon/evergreen_dma.c
> index a37b54436382..e6b8c752e42c 100644
> --- a/drivers/gpu/drm/radeon/evergreen_dma.c
> +++ b/drivers/gpu/drm/radeon/evergreen_dma.c
> @@ -151,6 +151,7 @@ int evergreen_copy_dma(struct radeon_device *rdev,
>         r = radeon_fence_emit(rdev, fence, ring->idx);
>         if (r) {
>                 radeon_ring_unlock_undo(rdev, ring);
> +               radeon_semaphore_free(rdev, &sem, NULL);
>                 return r;
>         }
>  diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
> index 7a4ee41c7cab..fc9568547a97 100644
> --- a/drivers/gpu/drm/radeon/r600.c
> +++ b/drivers/gpu/drm/radeon/r600.c
> @@ -2843,6 +2843,7 @@ int r600_copy_cpdma(struct radeon_device *rdev,
>         r = radeon_fence_emit(rdev, fence, ring->idx);
>         if (r) {
>                 radeon_ring_unlock_undo(rdev, ring);
> +               radeon_semaphore_free(rdev, &sem, NULL);
>                 return r;
>         }
>  diff --git a/drivers/gpu/drm/radeon/r600_dma.c
> b/drivers/gpu/drm/radeon/r600_dma.c
> index b2d4c91e6272..2590e2289303 100644
> --- a/drivers/gpu/drm/radeon/r600_dma.c
> +++ b/drivers/gpu/drm/radeon/r600_dma.c
> @@ -493,6 +493,7 @@ int r600_copy_dma(struct radeon_device *rdev,
>         r = radeon_fence_emit(rdev, fence, ring->idx);
>         if (r) {
>                 radeon_ring_unlock_undo(rdev, ring);
> +               radeon_semaphore_free(rdev, &sem, NULL);
>                 return r;
>         }
>  diff --git a/drivers/gpu/drm/radeon/rv770_dma.c
> b/drivers/gpu/drm/radeon/rv770_dma.c
> index aca8cbe8a335..bbf2e076ee45 100644
> --- a/drivers/gpu/drm/radeon/rv770_dma.c
> +++ b/drivers/gpu/drm/radeon/rv770_dma.c
> @@ -86,6 +86,7 @@ int rv770_copy_dma(struct radeon_device *rdev,
>         r = radeon_fence_emit(rdev, fence, ring->idx);
>         if (r) {
>                 radeon_ring_unlock_undo(rdev, ring);
> +               radeon_semaphore_free(rdev, &sem, NULL);
>                 return r;
>         }
>  diff --git a/drivers/gpu/drm/radeon/si_dma.c
> b/drivers/gpu/drm/radeon/si_dma.c
> index 59be2cfcbb47..e61ab2d7da41 100644
> --- a/drivers/gpu/drm/radeon/si_dma.c
> +++ b/drivers/gpu/drm/radeon/si_dma.c
> @@ -215,6 +215,7 @@ int si_copy_dma(struct radeon_device *rdev,
>         r = radeon_fence_emit(rdev, fence, ring->idx);
>         if (r) {
>                 radeon_ring_unlock_undo(rdev, ring);
> +               radeon_semaphore_free(rdev, &sem, NULL);
>                 return r;
>         }
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-04-28 14:19 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-24 11:29 [PATCH] drm/radeon: drm/radeon: add missing radeon_semaphore_free to error path Maarten Lankhorst
2014-04-26  1:39 ` Dieter Nützel
2014-04-28 14:19 ` 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.