6 files changed, 19 insertions, 16 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/cde_gk20a.c b/drivers/gpu/nvgpu/gk20a/cde_gk20a.c
index 730ffe5c..0413ae6a 100644
--- a/drivers/gpu/nvgpu/gk20a/cde_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/cde_gk20a.c
@@ -37,6 +37,7 @@
 #include "cde_gk20a.h"
 #include "fence_gk20a.h"
 #include "gr_gk20a.h"
+#include "platform_gk20a.h"
 
 #include <nvgpu/hw/gk20a/hw_ccsr_gk20a.h>
 #include <nvgpu/hw/gk20a/hw_pbdma_gk20a.h>
@@ -915,7 +916,7 @@ static struct gk20a_cde_ctx *gk20a_cde_allocate_context(struct gk20a *g)
                 return ERR_PTR(-ENOMEM);
 
         cde_ctx->g = g;
-        cde_ctx->dev = g->dev;
+        cde_ctx->dev = dev_from_gk20a(g);
 
         ret = gk20a_cde_load(cde_ctx);
         if (ret) {
@@ -982,7 +983,8 @@ __releases(&cde_app->mutex)
         /* First, map the buffer to local va */
 
         /* ensure that the compbits buffer has drvdata */
-        err = gk20a_dmabuf_alloc_drvdata(compbits_scatter_buf, g->dev);
+        err = gk20a_dmabuf_alloc_drvdata(compbits_scatter_buf,
+                        dev_from_gk20a(g));
         if (err)
                 goto exit_idle;
 
@@ -1048,7 +1050,7 @@ __releases(&cde_app->mutex)
 
                 gk20a_dbg(gpu_dbg_cde, "surface=0x%p scatterBuffer=0x%p",
                           surface, scatter_buffer);
-                sgt = gk20a_mm_pin(g->dev, compbits_scatter_buf);
+                sgt = gk20a_mm_pin(dev_from_gk20a(g), compbits_scatter_buf);
                 if (IS_ERR(sgt)) {
                         nvgpu_warn(g,
                                    "mm_pin failed");
@@ -1060,7 +1062,7 @@ __releases(&cde_app->mutex)
                                         scatterbuffer_size);
                         WARN_ON(err);
 
-                        gk20a_mm_unpin(g->dev, compbits_scatter_buf,
+                        gk20a_mm_unpin(dev_from_gk20a(g), compbits_scatter_buf,
                                        sgt);
                         if (err)
                                 goto exit_unmap_surface;
@@ -1072,7 +1074,7 @@ __releases(&cde_app->mutex)
         }
 
         /* store source buffer compression tags */
-        gk20a_get_comptags(g->dev, compbits_scatter_buf, &comptags);
+        gk20a_get_comptags(dev_from_gk20a(g), compbits_scatter_buf, &comptags);
         cde_ctx->surf_param_offset = comptags.offset;
         cde_ctx->surf_param_lines = comptags.lines;
 
diff --git a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c
index 546d2eb1..54986e6c 100644
--- a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c
@@ -134,7 +134,7 @@ static int gk20a_dbg_gpu_do_dev_open(struct inode *inode,
         if (!g)
                 return -ENODEV;
 
-        dev = g->dev;
+        dev = dev_from_gk20a(g);
 
         gk20a_dbg(gpu_dbg_fn | gpu_dbg_gpu_dbg, "dbg session: %s", g->name);
 
diff --git a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c
index 4235788b..aca9df75 100644
--- a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c
@@ -536,7 +536,7 @@ DEFINE_SIMPLE_ATTRIBUTE(gk20a_fecs_trace_debugfs_write_fops,
 
 static void gk20a_fecs_trace_debugfs_init(struct gk20a *g)
 {
-        struct gk20a_platform *plat = dev_get_drvdata(g->dev);
+        struct gk20a_platform *plat = dev_get_drvdata(dev_from_gk20a(g));
 
         debugfs_create_file("ctxsw_trace_read", 0600, plat->debugfs, g,
                 &gk20a_fecs_trace_debugfs_read_fops);
@@ -548,7 +548,7 @@ static void gk20a_fecs_trace_debugfs_init(struct gk20a *g)
 
 static void gk20a_fecs_trace_debugfs_cleanup(struct gk20a *g)
 {
-        struct gk20a_platform *plat = dev_get_drvdata(g->dev);
+        struct gk20a_platform *plat = dev_get_drvdata(dev_from_gk20a(g));
 
         debugfs_remove_recursive(plat->debugfs);
 }
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index a87d34f9..9452e153 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -42,7 +42,6 @@
 #include "pstate/pstate.h"
 #endif
 
-
 #ifdef CONFIG_TEGRA_19x_GPU
 #include "nvgpu_gpuid_t19x.h"
 #endif
@@ -152,7 +151,7 @@ int gk20a_prepare_poweroff(struct gk20a *g)
 
 int gk20a_finalize_poweron(struct gk20a *g)
 {
-        struct gk20a_platform *platform = gk20a_get_platform(g->dev);
+        struct gk20a_platform *platform = gk20a_get_platform(dev_from_gk20a(g));
         int err;
 
         gk20a_dbg_fn("");
@@ -323,7 +322,7 @@ int gk20a_finalize_poweron(struct gk20a *g)
                 if (platform->disable_aspm && g->ops.xve.disable_aspm)
                         g->ops.xve.disable_aspm(g);
 
-                g->ops.xve.sw_init(g->dev);
+                g->ops.xve.sw_init(dev_from_gk20a(g));
                 g->ops.xve.available_speeds(g, &speed);
 
                 /* Set to max speed */
@@ -367,7 +366,7 @@ void gk20a_driver_start_unload(struct gk20a *g)
         if (g->is_virtual)
                 return;
 
-        gk20a_wait_for_idle(g->dev);
+        gk20a_wait_for_idle(dev_from_gk20a(g));
 
         nvgpu_wait_for_deferred_interrupts(g);
         gk20a_channel_cancel_pending_sema_waits(g);
@@ -407,7 +406,7 @@ int gk20a_wait_for_idle(struct device *dev)
 int gk20a_init_gpu_characteristics(struct gk20a *g)
 {
         struct nvgpu_gpu_characteristics *gpu = &g->gpu_characteristics;
-        struct gk20a_platform *platform = dev_get_drvdata(g->dev);
+        struct gk20a_platform *platform = dev_get_drvdata(dev_from_gk20a(g));
 
         gpu->L2_cache_size = g->ops.ltc.determine_L2_size_bytes(g);
         gpu->on_board_video_memory_size = 0; /* integrated GPU */
@@ -499,7 +498,8 @@ int gk20a_init_gpu_characteristics(struct gk20a *g)
         gpu->map_buffer_batch_limit = 256;
 
         if (platform->clk_round_rate)
-                gpu->max_freq = platform->clk_round_rate(g->dev, UINT_MAX);
+                gpu->max_freq = platform->clk_round_rate(dev_from_gk20a(g),
+                                                         UINT_MAX);
 
         g->ops.gr.get_preemption_mode_flags(g, &g->gr.preemption_mode_rec);
         gpu->graphics_preemption_mode_flags =
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index 3ac4e397..570aad18 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -39,6 +39,7 @@
 #include "regops_gk20a.h"
 #include "dbg_gpu_gk20a.h"
 #include "ctxsw_trace_gk20a.h"
+#include "platform_gk20a.h"
 
 #include <nvgpu/hw/gk20a/hw_ccsr_gk20a.h>
 #include <nvgpu/hw/gk20a/hw_ctxsw_prog_gk20a.h>
@@ -4826,7 +4827,7 @@ static int gk20a_init_gr_setup_sw(struct gk20a *g)
         gr->sw_ready = true;
 
         if (g->ops.gr.create_gr_sysfs)
-                g->ops.gr.create_gr_sysfs(g->dev);
+                g->ops.gr.create_gr_sysfs(dev_from_gk20a(g));
 
         gk20a_dbg_fn("done");
         return 0;
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
index 9cc4f58e..b7b68575 100644
--- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
@@ -1992,7 +1992,7 @@ int gk20a_dmabuf_get_state(struct dma_buf *dmabuf, struct gk20a *g,
         int err = 0;
         struct gk20a_dmabuf_priv *priv;
         struct gk20a_buffer_state *s;
-        struct device *dev = g->dev;
+        struct device *dev = dev_from_gk20a(g);
 
         if (WARN_ON(offset >= (u64)dmabuf->size))
                 return -EINVAL;