drm/ttm: use bit flag to replace allow_reserved_eviction in ttm_operation_ctx

for saving memory and more bit flag can be used in future

Signed-off-by: Roger He <Hongbo.He@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

3 files changed, 6 insertions, 5 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index eaa3cb0c3ad1..dc34b50e6b29 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -346,8 +346,8 @@ static int amdgpu_cs_bo_validate(struct amdgpu_cs_parser *p,
         struct ttm_operation_ctx ctx = {
                 .interruptible = true,
                 .no_wait_gpu = false,
-                .allow_reserved_eviction = false,
-                .resv = bo->tbo.resv
+                .resv = bo->tbo.resv,
+                .flags = 0
         };
         uint32_t domain;
         int r;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
index 969de54b62da..c2a4b7215c46 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@ -341,8 +341,8 @@ static int amdgpu_bo_do_create(struct amdgpu_device *adev,
         struct ttm_operation_ctx ctx = {
                 .interruptible = !kernel,
                 .no_wait_gpu = false,
-                .allow_reserved_eviction = true,
-                .resv = resv
+                .resv = resv,
+                .flags = TTM_OPT_FLAG_ALLOW_RES_EVICT
         };
         struct amdgpu_bo *bo;
         enum ttm_bo_type type;
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index d90b1cf10b27..a907311afe1a 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -730,7 +730,8 @@ static bool ttm_bo_evict_swapout_allowable(struct ttm_buffer_object *bo,
         *locked = false;
         if (bo->resv == ctx->resv) {
                 reservation_object_assert_held(bo->resv);
-                if (ctx->allow_reserved_eviction || !list_empty(&bo->ddestroy))
+                if (ctx->flags & TTM_OPT_FLAG_ALLOW_RES_EVICT
+                    || !list_empty(&bo->ddestroy))
                         ret = true;
         } else {
                 *locked = reservation_object_trylock(bo->resv);