gpu: nvgpu: Pass gk20a to XVE init

Pass gk20a pointer instead of struct device pointer to XVE init.

Change-Id: I5f5efc1d09430a45a49321830b1d7f17c7a57e2f
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1528264
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Alex Waterman <alexw@nvidia.com>
GVS: Gerrit_Virtual_Submit

4 files changed, 4 insertions, 8 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index 7d577cda..7bd6acfd 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -332,7 +332,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(dev_from_gk20a(g));
+                g->ops.xve.sw_init(g);
                 g->ops.xve.available_speeds(g, &speed);
 
                 /* Set to max speed */
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index 83cdeb3f..aeba1fcd 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -969,7 +969,7 @@ struct gpu_ops {
         } css;
 #endif
         struct {
-                int (*sw_init)(struct device *dev);
+                int (*sw_init)(struct gk20a *g);
                 int (*get_speed)(struct gk20a *g, u32 *xve_link_speed);
                 int (*set_speed)(struct gk20a *g, u32 xve_link_speed);
                 void (*available_speeds)(struct gk20a *g, u32 *speed_mask);
diff --git a/drivers/gpu/nvgpu/gp106/xve_gp106.c b/drivers/gpu/nvgpu/gp106/xve_gp106.c
index 67b77048..89b6b873 100644
--- a/drivers/gpu/nvgpu/gp106/xve_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/xve_gp106.c
@@ -22,9 +22,6 @@
 #include "gk20a/gk20a.h"
 #include "gm206/bios_gm206.h"
 #include "gp106/xve_gp106.h"
-#ifdef CONFIG_DEBUG_FS
-#include "gk20a/platform_gk20a.h"
-#endif
 #include "common/linux/os_linux.h"
 
 #include <nvgpu/bug.h>
@@ -603,11 +600,10 @@ static const struct file_operations xve_link_control_status_fops = {
 };
 #endif
 
-int xve_sw_init_gp106(struct device *dev)
+int xve_sw_init_gp106(struct gk20a *g)
 {
         int err = -ENODEV;
 #ifdef CONFIG_DEBUG_FS
-        struct gk20a *g = gk20a_from_dev(dev);
         struct nvgpu_os_linux *l = nvgpu_os_linux_from_gk20a(g);
         struct dentry *gpu_root = l->debugfs;
 
diff --git a/drivers/gpu/nvgpu/gp106/xve_gp106.h b/drivers/gpu/nvgpu/gp106/xve_gp106.h
index 31d3a125..37ead910 100644
--- a/drivers/gpu/nvgpu/gp106/xve_gp106.h
+++ b/drivers/gpu/nvgpu/gp106/xve_gp106.h
@@ -104,7 +104,7 @@ int xve_get_speed_gp106(struct gk20a *g, u32 *xve_link_speed);
 void xve_disable_aspm_gp106(struct gk20a *g);
 int xve_set_speed_gp106(struct gk20a *g, u32 next_link_speed);
 void xve_available_speeds_gp106(struct gk20a *g, u32 *speed_mask);
-int xve_sw_init_gp106(struct device *dev);
+int xve_sw_init_gp106(struct gk20a *g);
 #if defined(CONFIG_PCI_MSI)
 void xve_rearm_msi_gp106(struct gk20a *g);
 #endif