[PATCH] drm/qxl: fix usage of ttm_bo_init

[PATCH] drm/qxl: fix usage of ttm_bo_init

[Christian König]

We need to use ttm_bo_init_reserved here to make sure
that the BO is pinned before it becomes visible on the LRU.

Signed-off-by: Christian König <christian.koenig@amd.com>
---
 drivers/gpu/drm/qxl/qxl_object.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/qxl/qxl_object.c b/drivers/gpu/drm/qxl/qxl_object.c
index d3635e3e3267..c8b67e7a3f02 100644
--- a/drivers/gpu/drm/qxl/qxl_object.c
+++ b/drivers/gpu/drm/qxl/qxl_object.c
@@ -106,6 +106,7 @@ int qxl_bo_create(struct qxl_device *qdev,
 		  struct qxl_surface *surf,
 		  struct qxl_bo **bo_ptr)
 {
+	struct ttm_operation_ctx ctx = { !kernel, false };
 	struct qxl_bo *bo;
 	enum ttm_bo_type type;
 	int r;
@@ -134,9 +135,9 @@ int qxl_bo_create(struct qxl_device *qdev,
 
 	qxl_ttm_placement_from_domain(bo, domain);
 
-	r = ttm_bo_init(&qdev->mman.bdev, &bo->tbo, size, type,
-			&bo->placement, 0, !kernel, size,
-			NULL, NULL, &qxl_ttm_bo_destroy);
+	r = ttm_bo_init_reserved(&qdev->mman.bdev, &bo->tbo, size, type,
+				 &bo->placement, 0, &ctx, size,
+				 NULL, NULL, &qxl_ttm_bo_destroy);
 	if (unlikely(r != 0)) {
 		if (r != -ERESTARTSYS)
 			dev_err(qdev->ddev.dev,
@@ -146,6 +147,7 @@ int qxl_bo_create(struct qxl_device *qdev,
 	}
 	if (pinned)
 		ttm_bo_pin(&bo->tbo);
+	ttm_bo_unreserve(&bo->tbo);
 	*bo_ptr = bo;
 	return 0;
 }
-- 
2.17.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] drm/qxl: fix usage of ttm_bo_init

[Daniel Vetter]

On Tue, Sep 29, 2020 at 01:23:06PM +0200, Christian König wrote:
> We need to use ttm_bo_init_reserved here to make sure
> that the BO is pinned before it becomes visible on the LRU.
> 
> Signed-off-by: Christian König <christian.koenig@amd.com>

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>

But maybe let Gerd test this first before pushing :-)
-Daniel

> ---
>  drivers/gpu/drm/qxl/qxl_object.c | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/qxl/qxl_object.c b/drivers/gpu/drm/qxl/qxl_object.c
> index d3635e3e3267..c8b67e7a3f02 100644
> --- a/drivers/gpu/drm/qxl/qxl_object.c
> +++ b/drivers/gpu/drm/qxl/qxl_object.c
> @@ -106,6 +106,7 @@ int qxl_bo_create(struct qxl_device *qdev,
>  		  struct qxl_surface *surf,
>  		  struct qxl_bo **bo_ptr)
>  {
> +	struct ttm_operation_ctx ctx = { !kernel, false };
>  	struct qxl_bo *bo;
>  	enum ttm_bo_type type;
>  	int r;
> @@ -134,9 +135,9 @@ int qxl_bo_create(struct qxl_device *qdev,
>  
>  	qxl_ttm_placement_from_domain(bo, domain);
>  
> -	r = ttm_bo_init(&qdev->mman.bdev, &bo->tbo, size, type,
> -			&bo->placement, 0, !kernel, size,
> -			NULL, NULL, &qxl_ttm_bo_destroy);
> +	r = ttm_bo_init_reserved(&qdev->mman.bdev, &bo->tbo, size, type,
> +				 &bo->placement, 0, &ctx, size,
> +				 NULL, NULL, &qxl_ttm_bo_destroy);
>  	if (unlikely(r != 0)) {
>  		if (r != -ERESTARTSYS)
>  			dev_err(qdev->ddev.dev,
> @@ -146,6 +147,7 @@ int qxl_bo_create(struct qxl_device *qdev,
>  	}
>  	if (pinned)
>  		ttm_bo_pin(&bo->tbo);
> +	ttm_bo_unreserve(&bo->tbo);
>  	*bo_ptr = bo;
>  	return 0;
>  }
> -- 
> 2.17.1
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] drm/qxl: fix usage of ttm_bo_init

[Gerd Hoffmann]

On Tue, Sep 29, 2020 at 01:23:06PM +0200, Christian König wrote:
> We need to use ttm_bo_init_reserved here to make sure
> that the BO is pinned before it becomes visible on the LRU.
> 
> Signed-off-by: Christian König <christian.koenig@amd.com>

Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>#
Tested-by: Gerd Hoffmann <kraxel@redhat.com>#

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel