gpu: nvgpu: Use common allocator for compbit store

Reduce amount of duplicate code around memory allocation by using
common helpers, and common data structure for storing results of
allocations.

Bug 1605769

Change-Id: I7c1662b669ed8c86465254f6001e536141051ee5
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/720435

1 files changed, 2 insertions, 5 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index e8340216..1e6cca6d 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -2944,8 +2944,6 @@ int gk20a_free_obj_ctx(struct channel_gk20a  *c,
 static void gk20a_remove_gr_support(struct gr_gk20a *gr)
 {
         struct gk20a *g = gr->g;
-        struct device *d = dev_from_gk20a(g);
-        DEFINE_DMA_ATTRS(attrs);
 
         gk20a_dbg_fn("");
 
@@ -2954,9 +2952,8 @@ static void gk20a_remove_gr_support(struct gr_gk20a *gr)
         gk20a_gmmu_free(g, &gr->mmu_wr_mem);
         gk20a_gmmu_free(g, &gr->mmu_rd_mem);
 
-        dma_set_attr(DMA_ATTR_NO_KERNEL_MAPPING, &attrs);
-        dma_free_attrs(d, gr->compbit_store.size, gr->compbit_store.pages,
-                        gr->compbit_store.base_iova, &attrs);
+        gk20a_gmmu_free_attr(g, DMA_ATTR_NO_KERNEL_MAPPING,
+                             &gr->compbit_store.mem);
 
         memset(&gr->compbit_store, 0, sizeof(struct compbit_store_desc));