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/clk | |
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/clk')
-rw-r--r-- | drivers/gpu/nvgpu/clk/clk_arb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/clk/clk_arb.c b/drivers/gpu/nvgpu/clk/clk_arb.c index 67e452f0..539cd33e 100644 --- a/drivers/gpu/nvgpu/clk/clk_arb.c +++ b/drivers/gpu/nvgpu/clk/clk_arb.c | |||
@@ -759,7 +759,7 @@ static void nvgpu_clk_arb_run_arbiter_cb(struct nvgpu_clk_arb *arb) | |||
759 | goto exit_arb; | 759 | goto exit_arb; |
760 | 760 | ||
761 | #ifdef CONFIG_DEBUG_FS | 761 | #ifdef CONFIG_DEBUG_FS |
762 | g->ops.bus.read_ptimer(g, &t0); | 762 | g->ops.ptimer.read_ptimer(g, &t0); |
763 | #endif | 763 | #endif |
764 | 764 | ||
765 | /* Only one arbiter should be running */ | 765 | /* Only one arbiter should be running */ |
@@ -958,7 +958,7 @@ static void nvgpu_clk_arb_run_arbiter_cb(struct nvgpu_clk_arb *arb) | |||
958 | nvgpu_cond_signal_interruptible(&arb->request_wq); | 958 | nvgpu_cond_signal_interruptible(&arb->request_wq); |
959 | 959 | ||
960 | #ifdef CONFIG_DEBUG_FS | 960 | #ifdef CONFIG_DEBUG_FS |
961 | g->ops.bus.read_ptimer(g, &t1); | 961 | g->ops.ptimer.read_ptimer(g, &t1); |
962 | 962 | ||
963 | debug = arb->debug == &arb->debug_pool[0] ? | 963 | debug = arb->debug == &arb->debug_pool[0] ? |
964 | &arb->debug_pool[1] : &arb->debug_pool[0]; | 964 | &arb->debug_pool[1] : &arb->debug_pool[0]; |