From e83372e0cc78a16777f0d2f43936e772f40308d2 Mon Sep 17 00:00:00 2001 From: Konsta Holtta Date: Tue, 14 Mar 2017 13:37:58 +0200 Subject: gpu: nvgpu: gv11b: abstract away dma alloc attrs Don't use gk20a_gmmu_free_attr because the attrs are embedded in struct mem_desc now. Bug 1853519 Change-Id: Iaa4309d4c2cd334346e09c4fbf15ce826f2ff640 Signed-off-by: Konsta Holtta Reviewed-on: http://git-master/r/1321314 Reviewed-by: svccoveritychecker GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/gv11b/subctx_gv11b.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'drivers/gpu/nvgpu/gv11b/subctx_gv11b.c') diff --git a/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c b/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c index 63cce491..6344b5fb 100644 --- a/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c @@ -37,7 +37,7 @@ void gv11b_free_subctx_header(struct channel_gk20a *c) gk20a_gmmu_unmap(c->vm, ctx->mem.gpu_va, ctx->mem.size, gk20a_mem_flag_none); - gk20a_gmmu_free_attr(g, DMA_ATTR_NO_KERNEL_MAPPING, &ctx->mem); + gk20a_gmmu_free(g, &ctx->mem); } } @@ -51,8 +51,8 @@ int gv11b_alloc_subctx_header(struct channel_gk20a *c) gk20a_dbg_fn(""); if (ctx->mem.gpu_va == 0) { - ret = gk20a_gmmu_alloc_attr_sys(g, - DMA_ATTR_NO_KERNEL_MAPPING, + ret = gk20a_gmmu_alloc_flags_sys(g, + NVGPU_DMA_NO_KERNEL_MAPPING, gr->ctx_vars.golden_image_size, &ctx->mem); if (ret) { @@ -69,8 +69,7 @@ int gv11b_alloc_subctx_header(struct channel_gk20a *c) if (!ctx->mem.gpu_va) { gk20a_err(dev_from_gk20a(g), "failed to map ctx header"); - gk20a_gmmu_free_attr(g, DMA_ATTR_NO_KERNEL_MAPPING, - &ctx->mem); + gk20a_gmmu_free(g, &ctx->mem); return -ENOMEM; } /* Now clear the buffer */ -- cgit v1.2.2