diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gm20b')
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/clk_gm20b.c | 16 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/clk_gm20b.h | 3 |
2 files changed, 8 insertions, 11 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/clk_gm20b.c b/drivers/gpu/nvgpu/gm20b/clk_gm20b.c index e13c7a51..f22d4c10 100644 --- a/drivers/gpu/nvgpu/gm20b/clk_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/clk_gm20b.c | |||
@@ -623,7 +623,7 @@ static int gm20b_clk_register_export_ops(struct gk20a *g) | |||
623 | return ret; | 623 | return ret; |
624 | } | 624 | } |
625 | 625 | ||
626 | int gm20b_init_clk_support(struct gk20a *g) | 626 | static int gm20b_init_clk_support(struct gk20a *g) |
627 | { | 627 | { |
628 | struct clk_gk20a *clk = &g->clk; | 628 | struct clk_gk20a *clk = &g->clk; |
629 | u32 err; | 629 | u32 err; |
@@ -673,13 +673,7 @@ int gm20b_init_clk_support(struct gk20a *g) | |||
673 | return err; | 673 | return err; |
674 | } | 674 | } |
675 | 675 | ||
676 | void gm20b_init_clk_ops(struct gpu_ops *gops) | 676 | static int gm20b_suspend_clk_support(struct gk20a *g) |
677 | { | ||
678 | gops->clk.init_clk_support = gm20b_init_clk_support; | ||
679 | gops->clk.suspend_clk_support = gm20b_suspend_clk_support; | ||
680 | } | ||
681 | |||
682 | int gm20b_suspend_clk_support(struct gk20a *g) | ||
683 | { | 677 | { |
684 | int ret; | 678 | int ret; |
685 | 679 | ||
@@ -693,6 +687,12 @@ int gm20b_suspend_clk_support(struct gk20a *g) | |||
693 | return ret; | 687 | return ret; |
694 | } | 688 | } |
695 | 689 | ||
690 | void gm20b_init_clk_ops(struct gpu_ops *gops) | ||
691 | { | ||
692 | gops->clk.init_clk_support = gm20b_init_clk_support; | ||
693 | gops->clk.suspend_clk_support = gm20b_suspend_clk_support; | ||
694 | } | ||
695 | |||
696 | #ifdef CONFIG_DEBUG_FS | 696 | #ifdef CONFIG_DEBUG_FS |
697 | 697 | ||
698 | static int rate_get(void *data, u64 *val) | 698 | static int rate_get(void *data, u64 *val) |
diff --git a/drivers/gpu/nvgpu/gm20b/clk_gm20b.h b/drivers/gpu/nvgpu/gm20b/clk_gm20b.h index 8615a4c1..cac5708c 100644 --- a/drivers/gpu/nvgpu/gm20b/clk_gm20b.h +++ b/drivers/gpu/nvgpu/gm20b/clk_gm20b.h | |||
@@ -21,9 +21,6 @@ | |||
21 | 21 | ||
22 | #include <linux/mutex.h> | 22 | #include <linux/mutex.h> |
23 | 23 | ||
24 | /* APIs used for separate HAL */ | ||
25 | void gm20b_init_clk_ops(struct gpu_ops *gops); | 24 | void gm20b_init_clk_ops(struct gpu_ops *gops); |
26 | int gm20b_init_clk_support(struct gk20a *g); | ||
27 | int gm20b_suspend_clk_support(struct gk20a *g); | ||
28 | 25 | ||
29 | #endif /* _NVHOST_CLK_GM20B_H_ */ | 26 | #endif /* _NVHOST_CLK_GM20B_H_ */ |