Revert "gpu: nvgpu: fix patch buf count update for vidmem"

This reverts commit de399ccb0019513a5f9e8f2bcadb02486f99bc80.

Bug 2012077

Change-Id: Ie608c3b41aa91f9aaed3fad240ed882a0c6f1ea2
Signed-off-by: Timo Alho <talho@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1591423
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
GVS: Gerrit_Virtual_Submit

1 files changed, 6 insertions, 13 deletions

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;