diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 10 |
2 files changed, 4 insertions, 10 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c index ee6586ae..91c82104 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c | |||
@@ -918,8 +918,8 @@ int gk20a_pm_finalize_poweron(struct device *dev) | |||
918 | g->gpu_reset_done = true; | 918 | g->gpu_reset_done = true; |
919 | } | 919 | } |
920 | 920 | ||
921 | if (g->ops.bios.init) | 921 | if (g->ops.bios_init) |
922 | err = g->ops.bios.init(g); | 922 | err = g->ops.bios_init(g); |
923 | if (err) | 923 | if (err) |
924 | goto done; | 924 | goto done; |
925 | 925 | ||
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index 7f2383d9..b796b2cc 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -54,7 +54,6 @@ struct acr_desc; | |||
54 | #include "cde_gk20a.h" | 54 | #include "cde_gk20a.h" |
55 | #include "debug_gk20a.h" | 55 | #include "debug_gk20a.h" |
56 | #include "sched_gk20a.h" | 56 | #include "sched_gk20a.h" |
57 | #include "gm206/bios_gm206.h" | ||
58 | #ifdef CONFIG_ARCH_TEGRA_18x_SOC | 57 | #ifdef CONFIG_ARCH_TEGRA_18x_SOC |
59 | #include "clk/clk.h" | 58 | #include "clk/clk.h" |
60 | #include "clk/clk_arb.h" | 59 | #include "clk/clk_arb.h" |
@@ -62,7 +61,6 @@ struct acr_desc; | |||
62 | #include "pmgr/pmgr.h" | 61 | #include "pmgr/pmgr.h" |
63 | #include "therm/thrm.h" | 62 | #include "therm/thrm.h" |
64 | #endif | 63 | #endif |
65 | #include "gm206/bios_gm206.h" | ||
66 | 64 | ||
67 | #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0) | 65 | #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0) |
68 | #define WRITE_ONCE(x, val) \ | 66 | #define WRITE_ONCE(x, val) \ |
@@ -751,12 +749,8 @@ struct gpu_ops { | |||
751 | int (*chip_init_gpu_characteristics)(struct gk20a *g); | 749 | int (*chip_init_gpu_characteristics)(struct gk20a *g); |
752 | int (*read_ptimer)(struct gk20a *g, u64 *value); | 750 | int (*read_ptimer)(struct gk20a *g, u64 *value); |
753 | 751 | ||
754 | struct { | 752 | int (*bios_init)(struct gk20a *g); |
755 | int (*init)(struct gk20a *g); | 753 | |
756 | void *(*get_perf_table_ptrs)(struct gk20a *g, | ||
757 | struct bit_token *ptoken, u8 table_id); | ||
758 | int (*execute_script)(struct gk20a *g, u32 offset); | ||
759 | } bios; | ||
760 | #if defined(CONFIG_GK20A_CYCLE_STATS) | 754 | #if defined(CONFIG_GK20A_CYCLE_STATS) |
761 | struct { | 755 | struct { |
762 | int (*enable_snapshot)(struct channel_gk20a *ch, | 756 | int (*enable_snapshot)(struct channel_gk20a *ch, |