drm/qxl: fix usage of ttm_bo_init

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>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Tested-by: Gerd Hoffmann <kraxel@redhat.com>
Link: https://patchwork.freedesktop.org/patch/392561/?series=82199&rev=1

diff --git a/drivers/gpu/drm/qxl/qxl_object.c b/drivers/gpu/drm/qxl/qxl_object.c
index d3635e3e326710b804dbc5ca11430a593f766cd0..c8b67e7a3f021503bf64d2445683b03465f8120c 100644 (file)
--- 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;
 }