diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2018-05-24 18:25:41 -0400 |
---|---|---|
committer | Tejal Kudav <tkudav@nvidia.com> | 2018-06-14 09:44:07 -0400 |
commit | d71d38087ded679f60714dae3a859523a19df04f (patch) | |
tree | 61439d294705ef91ce08ae4c02d4921eec943283 /drivers/gpu/nvgpu/gp106/mclk_gp106.c | |
parent | 5215d65c25b5e76c19d9d12b03c52f69e2d40227 (diff) |
gpu: nvgpu: Separate timer from bus
Code touching timer registers was combined with bus code. They're two
logically separate register spaces, so separate the code accordingly.
JIRA NVGPU-588
Change-Id: I40e2925ff156669f41ddc1f2e7714f92a2da367b
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1730893
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gp106/mclk_gp106.c')
-rw-r--r-- | drivers/gpu/nvgpu/gp106/mclk_gp106.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gp106/mclk_gp106.c b/drivers/gpu/nvgpu/gp106/mclk_gp106.c index bfb66e6e..074aec92 100644 --- a/drivers/gpu/nvgpu/gp106/mclk_gp106.c +++ b/drivers/gpu/nvgpu/gp106/mclk_gp106.c | |||
@@ -3353,7 +3353,7 @@ int gp106_mclk_change(struct gk20a *g, u16 val) | |||
3353 | pseq_cmd->cmd_type = NV_PMU_SEQ_CMD_ID_RUN_SCRIPT; | 3353 | pseq_cmd->cmd_type = NV_PMU_SEQ_CMD_ID_RUN_SCRIPT; |
3354 | 3354 | ||
3355 | #ifdef CONFIG_DEBUG_FS | 3355 | #ifdef CONFIG_DEBUG_FS |
3356 | g->ops.bus.read_ptimer(g, &t0); | 3356 | g->ops.ptimer.read_ptimer(g, &t0); |
3357 | #endif | 3357 | #endif |
3358 | 3358 | ||
3359 | if (speed == GP106_MCLK_HIGH_SPEED) { | 3359 | if (speed == GP106_MCLK_HIGH_SPEED) { |
@@ -3402,7 +3402,7 @@ int gp106_mclk_change(struct gk20a *g, u16 val) | |||
3402 | mclk->speed = speed; | 3402 | mclk->speed = speed; |
3403 | 3403 | ||
3404 | #ifdef CONFIG_DEBUG_FS | 3404 | #ifdef CONFIG_DEBUG_FS |
3405 | g->ops.bus.read_ptimer(g, &t1); | 3405 | g->ops.ptimer.read_ptimer(g, &t1); |
3406 | 3406 | ||
3407 | nvgpu_mutex_acquire(&mclk->data_lock); | 3407 | nvgpu_mutex_acquire(&mclk->data_lock); |
3408 | mclk->switch_num++; | 3408 | mclk->switch_num++; |