All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/radeon/prime: reserve/unreserve around pin
@ 2012-06-12 15:10 Dave Airlie
  2012-06-12 15:17 ` Alex Deucher
  2012-06-12 16:24 ` Michel Dänzer
  0 siblings, 2 replies; 3+ messages in thread
From: Dave Airlie @ 2012-06-12 15:10 UTC (permalink / raw)
  To: dri-devel

From: Dave Airlie <airlied@redhat.com>

I finally got to test this code a bit more and hit the ttm
no reserved assert, so add the reservations around the pinning.

Signed-off-by: Dave Airlie <airlied@redhat.com>
---
 drivers/gpu/drm/radeon/radeon_prime.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_prime.c b/drivers/gpu/drm/radeon/radeon_prime.c
index 8ddab4c7..6bef46a 100644
--- a/drivers/gpu/drm/radeon/radeon_prime.c
+++ b/drivers/gpu/drm/radeon/radeon_prime.c
@@ -169,11 +169,17 @@ struct dma_buf *radeon_gem_prime_export(struct drm_device *dev,
 	struct radeon_bo *bo = gem_to_radeon_bo(obj);
 	int ret = 0;
 
+	ret = radeon_bo_reserve(bo, false);
+	if (unlikely(ret != 0))
+		return ERR_PTR(ret);
+
 	/* pin buffer into GTT */
 	ret = radeon_bo_pin(bo, RADEON_GEM_DOMAIN_GTT, NULL);
-	if (ret)
+	if (ret) {
+		radeon_bo_unreserve(bo);
 		return ERR_PTR(ret);
-
+	}
+	radeon_bo_unreserve(bo);
 	return dma_buf_export(bo, &radeon_dmabuf_ops, obj->size, flags);
 }
 
-- 
1.7.7.6

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] drm/radeon/prime: reserve/unreserve around pin
  2012-06-12 15:10 [PATCH] drm/radeon/prime: reserve/unreserve around pin Dave Airlie
@ 2012-06-12 15:17 ` Alex Deucher
  2012-06-12 16:24 ` Michel Dänzer
  1 sibling, 0 replies; 3+ messages in thread
From: Alex Deucher @ 2012-06-12 15:17 UTC (permalink / raw)
  To: Dave Airlie; +Cc: dri-devel

On Tue, Jun 12, 2012 at 11:10 AM, Dave Airlie <airlied@gmail.com> wrote:
> From: Dave Airlie <airlied@redhat.com>
>
> I finally got to test this code a bit more and hit the ttm
> no reserved assert, so add the reservations around the pinning.

Good catch.

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

>
> Signed-off-by: Dave Airlie <airlied@redhat.com>
> ---
>  drivers/gpu/drm/radeon/radeon_prime.c |   10 ++++++++--
>  1 files changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_prime.c b/drivers/gpu/drm/radeon/radeon_prime.c
> index 8ddab4c7..6bef46a 100644
> --- a/drivers/gpu/drm/radeon/radeon_prime.c
> +++ b/drivers/gpu/drm/radeon/radeon_prime.c
> @@ -169,11 +169,17 @@ struct dma_buf *radeon_gem_prime_export(struct drm_device *dev,
>        struct radeon_bo *bo = gem_to_radeon_bo(obj);
>        int ret = 0;
>
> +       ret = radeon_bo_reserve(bo, false);
> +       if (unlikely(ret != 0))
> +               return ERR_PTR(ret);
> +
>        /* pin buffer into GTT */
>        ret = radeon_bo_pin(bo, RADEON_GEM_DOMAIN_GTT, NULL);
> -       if (ret)
> +       if (ret) {
> +               radeon_bo_unreserve(bo);
>                return ERR_PTR(ret);
> -
> +       }
> +       radeon_bo_unreserve(bo);
>        return dma_buf_export(bo, &radeon_dmabuf_ops, obj->size, flags);
>  }
>
> --
> 1.7.7.6
>
> _______________________________________________
> 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/prime: reserve/unreserve around pin
  2012-06-12 15:10 [PATCH] drm/radeon/prime: reserve/unreserve around pin Dave Airlie
  2012-06-12 15:17 ` Alex Deucher
@ 2012-06-12 16:24 ` Michel Dänzer
  1 sibling, 0 replies; 3+ messages in thread
From: Michel Dänzer @ 2012-06-12 16:24 UTC (permalink / raw)
  To: Dave Airlie; +Cc: dri-devel

On Die, 2012-06-12 at 16:10 +0100, Dave Airlie wrote: 
> From: Dave Airlie <airlied@redhat.com>
> 
> I finally got to test this code a bit more and hit the ttm
> no reserved assert, so add the reservations around the pinning.
> 
> Signed-off-by: Dave Airlie <airlied@redhat.com>
> ---
>  drivers/gpu/drm/radeon/radeon_prime.c |   10 ++++++++--
>  1 files changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/radeon/radeon_prime.c b/drivers/gpu/drm/radeon/radeon_prime.c
> index 8ddab4c7..6bef46a 100644
> --- a/drivers/gpu/drm/radeon/radeon_prime.c
> +++ b/drivers/gpu/drm/radeon/radeon_prime.c
> @@ -169,11 +169,17 @@ struct dma_buf *radeon_gem_prime_export(struct drm_device *dev,
>  	struct radeon_bo *bo = gem_to_radeon_bo(obj);
>  	int ret = 0;
>  
> +	ret = radeon_bo_reserve(bo, false);
> +	if (unlikely(ret != 0))
> +		return ERR_PTR(ret);
> +
>  	/* pin buffer into GTT */
>  	ret = radeon_bo_pin(bo, RADEON_GEM_DOMAIN_GTT, NULL);
> -	if (ret)
> +	if (ret) {
> +		radeon_bo_unreserve(bo);
>  		return ERR_PTR(ret);
> -
> +	}
> +	radeon_bo_unreserve(bo);

Could just add single radeon_bo_unreserve() call right after the
radeon_bo_pin() call, but either way

Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>


-- 
Earthling Michel Dänzer           |                   http://www.amd.com
Libre software enthusiast         |          Debian, X and DRI developer
_______________________________________________
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:[~2012-06-12 16:24 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-12 15:10 [PATCH] drm/radeon/prime: reserve/unreserve around pin Dave Airlie
2012-06-12 15:17 ` Alex Deucher
2012-06-12 16:24 ` Michel Dänzer

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.