From 5714f5eaaf4715c9989e5c2bf732cdb9136b0fbe Mon Sep 17 00:00:00 2001 From: Alex Waterman Date: Mon, 10 Apr 2017 14:03:16 -0700 Subject: gpu: nvgpu: Remove bools from nvgpu_mem Replace a couple of boolean fields in nvgpu_mem with bits in a bitmap introduced in an earlier patch. JIRA NVGPU-12 JIRA NVGPU-30 Change-Id: Iffc31bd629cab9a37e5a4fd13377eb9090353410 Signed-off-by: Alex Waterman Reviewed-on: http://git-master/r/1464079 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom Reviewed-by: svccoveritychecker --- drivers/gpu/nvgpu/common/linux/dma.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'drivers/gpu/nvgpu/common') diff --git a/drivers/gpu/nvgpu/common/linux/dma.c b/drivers/gpu/nvgpu/common/linux/dma.c index b943aabf..abcf36f1 100644 --- a/drivers/gpu/nvgpu/common/linux/dma.c +++ b/drivers/gpu/nvgpu/common/linux/dma.c @@ -204,9 +204,7 @@ int nvgpu_dma_alloc_flags_vid_at(struct gk20a *g, unsigned long flags, } if (at) - mem->fixed = true; - else - mem->fixed = false; + mem->mem_flags |= NVGPU_MEM_FLAG_FIXED; mem->priv.sgt = nvgpu_kzalloc(g, sizeof(struct sg_table)); if (!mem->priv.sgt) { @@ -375,7 +373,7 @@ static void nvgpu_dma_free_vid(struct gk20a *g, struct nvgpu_mem *mem) /* Sanity check - only this supported when allocating. */ WARN_ON(mem->priv.flags != NVGPU_DMA_NO_KERNEL_MAPPING); - if (mem->user_mem) { + if (mem->mem_flags & NVGPU_MEM_FLAG_USER_MEM) { nvgpu_mutex_acquire(&g->mm.vidmem.clear_list_mutex); was_empty = nvgpu_list_empty(&g->mm.vidmem.clear_list_head); nvgpu_list_add_tail(&mem->clear_list_entry, -- cgit v1.2.2