diff options
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/clk_gk20a.h | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/clk_gk20a.h b/drivers/gpu/nvgpu/gk20a/clk_gk20a.h index 8408f460..aefbc5d5 100644 --- a/drivers/gpu/nvgpu/gk20a/clk_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/clk_gk20a.h | |||
@@ -74,12 +74,16 @@ struct pll_parms { | |||
74 | u32 iddq_exit_delay; | 74 | u32 iddq_exit_delay; |
75 | }; | 75 | }; |
76 | 76 | ||
77 | struct namemap_cfg; | ||
78 | |||
77 | struct clk_gk20a { | 79 | struct clk_gk20a { |
78 | struct gk20a *g; | 80 | struct gk20a *g; |
79 | struct clk *tegra_clk; | 81 | struct clk *tegra_clk; |
80 | struct pll gpc_pll; | 82 | struct pll gpc_pll; |
81 | struct pll gpc_pll_last; | 83 | struct pll gpc_pll_last; |
82 | struct mutex clk_mutex; | 84 | struct mutex clk_mutex; |
85 | struct namemap_cfg *clk_namemap; | ||
86 | u32 namemap_num; | ||
83 | bool sw_ready; | 87 | bool sw_ready; |
84 | bool clk_hw_on; | 88 | bool clk_hw_on; |
85 | bool debugfs_set; | 89 | bool debugfs_set; |
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index edc4a0e1..f0849761 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -1116,6 +1116,11 @@ static inline u32 set_field(u32 val, u32 mask, u32 field) | |||
1116 | return ((val & ~mask) | field); | 1116 | return ((val & ~mask) | field); |
1117 | } | 1117 | } |
1118 | 1118 | ||
1119 | static inline u32 get_field(u32 reg, u32 mask) | ||
1120 | { | ||
1121 | return (reg & mask); | ||
1122 | } | ||
1123 | |||
1119 | /* invalidate channel lookup tlb */ | 1124 | /* invalidate channel lookup tlb */ |
1120 | static inline void gk20a_gr_flush_channel_tlb(struct gr_gk20a *gr) | 1125 | static inline void gk20a_gr_flush_channel_tlb(struct gr_gk20a *gr) |
1121 | { | 1126 | { |