From fe1e09d473044f7caaf8b834a094f4784bc5f5e1 Mon Sep 17 00:00:00 2001 From: Timo Alho Date: Fri, 3 Nov 2017 05:29:12 -0700 Subject: Revert "gpu: nvgpu: fix patch buf count update for vidmem" This reverts commit de399ccb0019513a5f9e8f2bcadb02486f99bc80. Bug 2012077 Change-Id: Ie608c3b41aa91f9aaed3fad240ed882a0c6f1ea2 Signed-off-by: Timo Alho Reviewed-on: https://git-master.nvidia.com/r/1591423 Reviewed-by: svc-mobile-coverity Reviewed-by: Terje Bergstrom Tested-by: Terje Bergstrom GVS: Gerrit_Virtual_Submit --- drivers/gpu/nvgpu/common/linux/nvgpu_mem.c | 19 ++++++------------- drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 4 ++-- drivers/gpu/nvgpu/include/nvgpu/nvgpu_mem.h | 10 ---------- 3 files changed, 8 insertions(+), 25 deletions(-) (limited to 'drivers/gpu/nvgpu') diff --git a/drivers/gpu/nvgpu/common/linux/nvgpu_mem.c b/drivers/gpu/nvgpu/common/linux/nvgpu_mem.c index 2bf26602..1dbbd1a0 100644 --- a/drivers/gpu/nvgpu/common/linux/nvgpu_mem.c +++ b/drivers/gpu/nvgpu/common/linux/nvgpu_mem.c @@ -60,14 +60,6 @@ int nvgpu_mem_begin(struct gk20a *g, struct nvgpu_mem *mem) { void *cpu_va; - if (WARN_ON(mem->cpu_accessible)) { - nvgpu_warn(g, "nested"); - return -EBUSY; - } - - /* flag that the intent is to allow CPU access to the memory. */ - mem->cpu_accessible = true; - if (mem->aperture != APERTURE_SYSMEM || g->mm.force_pramin) return 0; @@ -79,14 +71,17 @@ int nvgpu_mem_begin(struct gk20a *g, struct nvgpu_mem *mem) if (!(mem->priv.flags & NVGPU_DMA_NO_KERNEL_MAPPING)) return 0; + if (WARN_ON(mem->cpu_va)) { + nvgpu_warn(g, "nested"); + return -EBUSY; + } + cpu_va = vmap(mem->priv.pages, PAGE_ALIGN(mem->size) >> PAGE_SHIFT, 0, pgprot_writecombine(PAGE_KERNEL)); - if (WARN_ON(!cpu_va)) { - mem->cpu_accessible = false; + if (WARN_ON(!cpu_va)) return -ENOMEM; - } mem->cpu_va = cpu_va; return 0; @@ -94,8 +89,6 @@ int nvgpu_mem_begin(struct gk20a *g, struct nvgpu_mem *mem) void nvgpu_mem_end(struct gk20a *g, struct nvgpu_mem *mem) { - mem->cpu_accessible = false; - if (mem->aperture != APERTURE_SYSMEM || g->mm.force_pramin) return; diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index 06fb5497..2a20c2d9 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c @@ -682,7 +682,7 @@ int gr_gk20a_ctx_patch_write_begin(struct gk20a *g, if (err) return err; - if (nvgpu_mem_cpu_accessible(&ch_ctx->gr_ctx->mem)) { + if (ch_ctx->gr_ctx->mem.cpu_va) { /* reset patch count if ucode has already processed it */ ch_ctx->patch_ctx.data_count = nvgpu_mem_rd(g, &ch_ctx->gr_ctx->mem, @@ -699,7 +699,7 @@ void gr_gk20a_ctx_patch_write_end(struct gk20a *g, nvgpu_mem_end(g, &ch_ctx->patch_ctx.mem); /* Write context count to context image if it is mapped */ - if (nvgpu_mem_cpu_accessible(&ch_ctx->gr_ctx->mem)) { + if (ch_ctx->gr_ctx->mem.cpu_va) { nvgpu_mem_wr(g, &ch_ctx->gr_ctx->mem, ctxsw_prog_main_image_patch_count_o(), ch_ctx->patch_ctx.data_count); diff --git a/drivers/gpu/nvgpu/include/nvgpu/nvgpu_mem.h b/drivers/gpu/nvgpu/include/nvgpu/nvgpu_mem.h index bae50347..6feacff7 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/nvgpu_mem.h +++ b/drivers/gpu/nvgpu/include/nvgpu/nvgpu_mem.h @@ -122,7 +122,6 @@ struct nvgpu_mem { size_t aligned_size; u64 gpu_va; bool skip_wmb; - bool cpu_accessible; /* * Set when a nvgpu_mem struct is not a "real" nvgpu_mem struct. Instead @@ -211,15 +210,6 @@ static inline bool nvgpu_mem_is_valid(struct nvgpu_mem *mem) } -/* - * Returns true if the passed nvgpu_mem can be accessed by the CPU by virtue - * of having called nvgpu_mem_begin successfully. - */ -static inline bool nvgpu_mem_cpu_accessible(struct nvgpu_mem *mem) -{ - return mem->cpu_accessible; -} - /* * Create a nvgpu_sgt of the default implementation */ -- cgit v1.2.2