From 279c01f6ef626d59b93383d183fb69173d3f7ac7 Mon Sep 17 00:00:00 2001 From: Roger He Date: Fri, 8 Dec 2017 15:09:50 +0800 Subject: drm/ttm: use an operation ctx for ttm_mem_global_alloc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit forward the operation context to ttm_mem_global_alloc as well, and the ultimate goal is swapout enablement for reserved BOs Reviewed-by: Thomas Hellstrom Reviewed-by: Christian König Signed-off-by: Roger He Signed-off-by: Alex Deucher --- drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_fence.c') diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c index d6b1c509ae01..6c5c75cf5e6c 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c @@ -588,6 +588,10 @@ int vmw_user_fence_create(struct drm_file *file_priv, struct vmw_user_fence *ufence; struct vmw_fence_obj *tmp; struct ttm_mem_global *mem_glob = vmw_mem_glob(fman->dev_priv); + struct ttm_operation_ctx ctx = { + .interruptible = false, + .no_wait_gpu = false + }; int ret; /* @@ -596,7 +600,7 @@ int vmw_user_fence_create(struct drm_file *file_priv, */ ret = ttm_mem_global_alloc(mem_glob, fman->user_fence_size, - false, false); + &ctx); if (unlikely(ret != 0)) return ret; -- cgit v1.2.3