diff options
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/clk_gm20b.c | 17 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/mm_gm20b.c | 2 |
2 files changed, 1 insertions, 18 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/clk_gm20b.c b/drivers/gpu/nvgpu/gm20b/clk_gm20b.c index 8dda85b1..173de8c6 100644 --- a/drivers/gpu/nvgpu/gm20b/clk_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/clk_gm20b.c | |||
@@ -1052,23 +1052,6 @@ static int gm20b_init_clk_reset_enable_hw(struct gk20a *g) | |||
1052 | return 0; | 1052 | return 0; |
1053 | } | 1053 | } |
1054 | 1054 | ||
1055 | struct clk *gm20b_clk_get(struct gk20a *g) | ||
1056 | { | ||
1057 | if (!g->clk.tegra_clk) { | ||
1058 | struct clk *clk; | ||
1059 | |||
1060 | clk = clk_get_sys("tegra_gk20a", "gpu"); | ||
1061 | if (IS_ERR(clk)) { | ||
1062 | gk20a_err(dev_from_gk20a(g), | ||
1063 | "fail to get tegra gpu clk tegra_gk20a/gpu"); | ||
1064 | return NULL; | ||
1065 | } | ||
1066 | g->clk.tegra_clk = clk; | ||
1067 | } | ||
1068 | |||
1069 | return g->clk.tegra_clk; | ||
1070 | } | ||
1071 | |||
1072 | static int gm20b_init_clk_setup_sw(struct gk20a *g) | 1055 | static int gm20b_init_clk_setup_sw(struct gk20a *g) |
1073 | { | 1056 | { |
1074 | struct clk_gk20a *clk = &g->clk; | 1057 | struct clk_gk20a *clk = &g->clk; |
diff --git a/drivers/gpu/nvgpu/gm20b/mm_gm20b.c b/drivers/gpu/nvgpu/gm20b/mm_gm20b.c index 0113e227..cd40132f 100644 --- a/drivers/gpu/nvgpu/gm20b/mm_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/mm_gm20b.c | |||
@@ -280,7 +280,7 @@ static void gm20b_mm_set_big_page_size(struct gk20a *g, | |||
280 | gk20a_dbg_fn("done"); | 280 | gk20a_dbg_fn("done"); |
281 | } | 281 | } |
282 | 282 | ||
283 | u32 gm20b_mm_get_big_page_sizes(void) | 283 | static u32 gm20b_mm_get_big_page_sizes(void) |
284 | { | 284 | { |
285 | return SZ_64K | SZ_128K; | 285 | return SZ_64K | SZ_128K; |
286 | } | 286 | } |