gpu: nvgpu: Fix build failure by missing headers

Move the platform_gk20a.h include out of the ifdef CONFIG_DEBUG_FS
in the CDE code since dev_from_gk20a() is used regardless of
whether debugfs is enabled.

Also modify some of the CE ops to take a struct gk20a instead of a
struct device. This avoids any requirement for including
linux/device.h or platform_gk20a.h.

Bug 200310575

Change-Id: Ifef963cd0f66d05094a698200386cc6140920eac
Signed-off-by: skadamati <skadamati@nvidia.com>
Reviewed-on: http://git-master/r/1487830
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
index 72f9eeab..17fa0c17 100644
--- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
@@ -502,7 +502,7 @@ static int gk20a_vidmem_clear_all(struct gk20a *g)
         if (mm->vidmem.ce_ctx_id == (u32)~0)
                 return -EINVAL;
 
-        err = gk20a_ce_execute_ops(g->dev,
+        err = gk20a_ce_execute_ops(g,
                         mm->vidmem.ce_ctx_id,
                         0,
                         mm->vidmem.base,
@@ -521,7 +521,7 @@ static int gk20a_vidmem_clear_all(struct gk20a *g)
 
         region2_base = mm->vidmem.bootstrap_base + mm->vidmem.bootstrap_size;
 
-        err = gk20a_ce_execute_ops(g->dev,
+        err = gk20a_ce_execute_ops(g,
                         mm->vidmem.ce_ctx_id,
                         0,
                         region2_base,
@@ -765,7 +765,7 @@ void gk20a_init_mm_ce_context(struct gk20a *g)
 #if defined(CONFIG_GK20A_VIDMEM)
         if (g->mm.vidmem.size && (g->mm.vidmem.ce_ctx_id == (u32)~0)) {
                 g->mm.vidmem.ce_ctx_id =
-                        gk20a_ce_create_context_with_cb(g->dev,
+                        gk20a_ce_create_context_with_cb(g,
                                 gk20a_fifo_get_fast_ce_runlist_id(g),
                                 -1,
                                 -1,
@@ -1683,7 +1683,7 @@ static int gk20a_gmmu_clear_vidmem_mem(struct gk20a *g, struct nvgpu_mem *mem)
                 if (gk20a_last_fence)
                         gk20a_fence_put(gk20a_last_fence);
 
-                err = gk20a_ce_execute_ops(g->dev,
+                err = gk20a_ce_execute_ops(g,
                         g->mm.vidmem.ce_ctx_id,
                         0,
                         chunk->base,