diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gp10b')
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/gr_gp10b.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/hal_gp10b.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c index 96919d2e..c4d097a7 100644 --- a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c | |||
@@ -13,7 +13,6 @@ | |||
13 | * more details. | 13 | * more details. |
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include <linux/clk.h> | ||
17 | #include <linux/delay.h> | 16 | #include <linux/delay.h> |
18 | #include <linux/version.h> | 17 | #include <linux/version.h> |
19 | #include <linux/vmalloc.h> | 18 | #include <linux/vmalloc.h> |
@@ -2255,12 +2254,11 @@ static int gp10b_gr_fuse_override(struct gk20a *g) | |||
2255 | 2254 | ||
2256 | static int gr_gp10b_init_preemption_state(struct gk20a *g) | 2255 | static int gr_gp10b_init_preemption_state(struct gk20a *g) |
2257 | { | 2256 | { |
2258 | struct gk20a_platform *platform = gk20a_get_platform(g->dev); | ||
2259 | u32 debug_2; | 2257 | u32 debug_2; |
2260 | u64 sysclk_rate; | 2258 | u64 sysclk_rate; |
2261 | u32 sysclk_cycles; | 2259 | u32 sysclk_cycles; |
2262 | 2260 | ||
2263 | sysclk_rate = platform->clk_get_rate(g->dev); | 2261 | sysclk_rate = g->ops.clk.get_rate(g, CTRL_CLK_DOMAIN_GPCCLK); |
2264 | sysclk_cycles = (u32)((sysclk_rate * NVGPU_GFXP_WFI_TIMEOUT_US) / 1000000ULL); | 2262 | sysclk_cycles = (u32)((sysclk_rate * NVGPU_GFXP_WFI_TIMEOUT_US) / 1000000ULL); |
2265 | gk20a_writel(g, gr_fe_gfxp_wfi_timeout_r(), | 2263 | gk20a_writel(g, gr_fe_gfxp_wfi_timeout_r(), |
2266 | gr_fe_gfxp_wfi_timeout_count_f(sysclk_cycles)); | 2264 | gr_fe_gfxp_wfi_timeout_count_f(sysclk_cycles)); |
diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c index b57fcb5f..18e1ffdc 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c | |||
@@ -193,7 +193,7 @@ int gp10b_init_hal(struct gk20a *g) | |||
193 | struct gk20a_platform *platform = dev_get_drvdata(g->dev); | 193 | struct gk20a_platform *platform = dev_get_drvdata(g->dev); |
194 | u32 val; | 194 | u32 val; |
195 | 195 | ||
196 | *gops = gp10b_ops; | 196 | gops->clock_gating = gp10b_ops.clock_gating; |
197 | gops->pmupstate = false; | 197 | gops->pmupstate = false; |
198 | #ifdef CONFIG_TEGRA_ACR | 198 | #ifdef CONFIG_TEGRA_ACR |
199 | if (platform->is_fmodel) { | 199 | if (platform->is_fmodel) { |