diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2017-02-09 11:17:47 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-02-17 16:46:32 -0500 |
commit | 53465def649b813987ca0d4a7ced744305204b82 (patch) | |
tree | cdff16681cb0442de3b1a8bd151b2a38c0bc5311 /drivers/gpu/nvgpu/gk20a/gk20a.h | |
parent | 29a79e6b80c6a0da489d8b0a470c86e2fec9c355 (diff) |
gpu: nvgpu: Generalize BIOS code
Most of BIOS parsing code is not specific to any particular GPU. Move
most of the code to generic files, and leave only chip specific parts
dealing with microcontroller boot into chip specific files.
As most of the parsing is generic, they do not need to be called via
HALs so remove the HALs and change the calls into direct function
calls.
All definitions meant to be used outside BIOS code itself are now in
<nvgpu/bios.h>
Change-Id: Id48e94c74511d6e95645e90e5bba5c12ef8da45d
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1302222
GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.h')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 10 |
1 files changed, 2 insertions, 8 deletions
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, |