[PATCH 3/6] drm/ttm: use the parent resv for ghost objects v2

[Christian König]

This way we can even pipeline imported BO evictions.

v2: Limit this to only cases when the parent object uses a separate
    reservation object as well. This fixes another OOM problem.

Signed-off-by: Christian König <christian.koe...@amd.com>
---
 drivers/gpu/drm/ttm/ttm_bo_util.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c 
b/drivers/gpu/drm/ttm/ttm_bo_util.c
index 895d77d799e4..95f47d685921 100644
--- a/drivers/gpu/drm/ttm/ttm_bo_util.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_util.c
@@ -517,9 +517,11 @@ static int ttm_buffer_object_transfer(struct 
ttm_buffer_object *bo,
        kref_init(&fbo->base.kref);
        fbo->base.destroy = &ttm_transfered_destroy;
        fbo->base.acc_size = 0;
-       fbo->base.resv = &fbo->base.ttm_resv;
-       reservation_object_init(fbo->base.resv);
-       ret = reservation_object_trylock(fbo->base.resv);
+       if (bo->resv == &bo->ttm_resv)
+               fbo->base.resv = &fbo->base.ttm_resv;
+
+       reservation_object_init(&fbo->base.ttm_resv);
+       ret = reservation_object_trylock(&fbo->base.ttm_resv);
        WARN_ON(!ret);
 
        *new_obj = &fbo->base;
@@ -716,7 +718,7 @@ int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo,
                if (ret)
                        return ret;
 
-               reservation_object_add_excl_fence(ghost_obj->resv, fence);
+               reservation_object_add_excl_fence(&ghost_obj->ttm_resv, fence);
 
                /**
                 * If we're not moving to fixed memory, the TTM object
@@ -729,7 +731,7 @@ int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo,
                else
                        bo->ttm = NULL;
 
-               ttm_bo_unreserve(ghost_obj);
+               reservation_object_unlock(&ghost_obj->ttm_resv);
                ttm_bo_put(ghost_obj);
        }
 
@@ -772,7 +774,7 @@ int ttm_bo_pipeline_move(struct ttm_buffer_object *bo,
                if (ret)
                        return ret;
 
-               reservation_object_add_excl_fence(ghost_obj->resv, fence);
+               reservation_object_add_excl_fence(&ghost_obj->ttm_resv, fence);
 
                /**
                 * If we're not moving to fixed memory, the TTM object
@@ -785,7 +787,7 @@ int ttm_bo_pipeline_move(struct ttm_buffer_object *bo,
                else
                        bo->ttm = NULL;
 
-               ttm_bo_unreserve(ghost_obj);
+               reservation_object_unlock(&ghost_obj->ttm_resv);
                ttm_bo_put(ghost_obj);
 
        } else if (from->flags & TTM_MEMTYPE_FLAG_FIXED) {
@@ -841,7 +843,7 @@ int ttm_bo_pipeline_gutting(struct ttm_buffer_object *bo)
        if (ret)
                return ret;
 
-       ret = reservation_object_copy_fences(ghost->resv, bo->resv);
+       ret = reservation_object_copy_fences(&ghost->ttm_resv, bo->resv);
        /* Last resort, wait for the BO to be idle when we are OOM */
        if (ret)
                ttm_bo_wait(bo, false, false);
@@ -850,7 +852,7 @@ int ttm_bo_pipeline_gutting(struct ttm_buffer_object *bo)
        bo->mem.mem_type = TTM_PL_SYSTEM;
        bo->ttm = NULL;
 
-       ttm_bo_unreserve(ghost);
+       reservation_object_unlock(&ghost->ttm_resv);
        ttm_bo_put(ghost);
 
        return 0;
-- 
2.17.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx