2 files changed, 15 insertions, 1 deletions

diff --git a/drivers/gpu/nvgpu/common/linux/module.c b/drivers/gpu/nvgpu/common/linux/module.c
index ac64041e..52f987b2 100644
--- a/drivers/gpu/nvgpu/common/linux/module.c
+++ b/drivers/gpu/nvgpu/common/linux/module.c
@@ -25,6 +25,7 @@
 #include <linux/reset.h>
 #include <linux/platform/tegra/common.h>
 
+#include <nvgpu/dma.h>
 #include <nvgpu/kmem.h>
 #include <nvgpu/nvgpu_common.h>
 #include <nvgpu/soc.h>
@@ -1026,9 +1027,16 @@ int nvgpu_remove(struct device *dev, struct class *class)
         struct gk20a *g = get_gk20a(dev);
         struct nvgpu_os_linux *l = nvgpu_os_linux_from_gk20a(g);
         struct gk20a_platform *platform = gk20a_get_platform(dev);
+        int err;
 
         gk20a_dbg_fn("");
 
+        err = nvgpu_quiesce(g);
+        WARN(err, "gpu failed to idle during driver removal");
+
+        if (nvgpu_mem_is_valid(&g->syncpt_mem))
+                nvgpu_dma_free(g, &g->syncpt_mem);
+
         if (platform->has_cde)
                 gk20a_cde_destroy(l);
 
@@ -1061,7 +1069,7 @@ int nvgpu_remove(struct device *dev, struct class *class)
 
         gk20a_dbg_fn("removed");
 
-        return 0;
+        return err;
 }
 
 static int __exit gk20a_remove(struct platform_device *pdev)
diff --git a/drivers/gpu/nvgpu/common/mm/vm.c b/drivers/gpu/nvgpu/common/mm/vm.c
index 354d6ce4..f8d58349 100644
--- a/drivers/gpu/nvgpu/common/mm/vm.c
+++ b/drivers/gpu/nvgpu/common/mm/vm.c
@@ -527,6 +527,12 @@ static void __nvgpu_vm_remove(struct vm_gk20a *vm)
                 }
         }
 
+#if defined(CONFIG_TEGRA_GK20A_NVHOST) && defined(CONFIG_TEGRA_19x_GPU)
+        if (nvgpu_mem_is_valid(&g->syncpt_mem) && vm->syncpt_ro_map_gpu_va)
+                nvgpu_gmmu_unmap(vm, &g->syncpt_mem,
+                                vm->syncpt_ro_map_gpu_va);
+#endif
+
         nvgpu_mutex_acquire(&vm->update_gmmu_lock);
 
         nvgpu_rbtree_enum_start(0, &node, vm->mapped_buffers);