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 | |
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')
-rw-r--r-- | drivers/gpu/nvgpu/gp106/hal_gp106.c | 11 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp106/mclk_gp106.c | 4 |
2 files changed, 10 insertions, 5 deletions
diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c index 1a9c6a74..33e69d4e 100644 --- a/drivers/gpu/nvgpu/gp106/hal_gp106.c +++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c | |||
@@ -24,6 +24,7 @@ | |||
24 | 24 | ||
25 | #include "common/bus/bus_gk20a.h" | 25 | #include "common/bus/bus_gk20a.h" |
26 | #include "common/clock_gating/gp106_gating_reglist.h" | 26 | #include "common/clock_gating/gp106_gating_reglist.h" |
27 | #include "common/ptimer/ptimer_gk20a.h" | ||
27 | 28 | ||
28 | #include "gk20a/gk20a.h" | 29 | #include "gk20a/gk20a.h" |
29 | #include "gk20a/fifo_gk20a.h" | 30 | #include "gk20a/fifo_gk20a.h" |
@@ -86,7 +87,7 @@ | |||
86 | 87 | ||
87 | #include <nvgpu/debug.h> | 88 | #include <nvgpu/debug.h> |
88 | #include <nvgpu/bug.h> | 89 | #include <nvgpu/bug.h> |
89 | #include <nvgpu/bus.h> | 90 | #include <nvgpu/ptimer.h> |
90 | #include <nvgpu/enabled.h> | 91 | #include <nvgpu/enabled.h> |
91 | #include <nvgpu/ctxsw_trace.h> | 92 | #include <nvgpu/ctxsw_trace.h> |
92 | #include <nvgpu/error_notifier.h> | 93 | #include <nvgpu/error_notifier.h> |
@@ -720,11 +721,14 @@ static const struct gpu_ops gp106_ops = { | |||
720 | .bus = { | 721 | .bus = { |
721 | .init_hw = gk20a_bus_init_hw, | 722 | .init_hw = gk20a_bus_init_hw, |
722 | .isr = gk20a_bus_isr, | 723 | .isr = gk20a_bus_isr, |
723 | .read_ptimer = gk20a_read_ptimer, | ||
724 | .get_timestamps_zipper = nvgpu_get_timestamps_zipper, | ||
725 | .bar1_bind = gk20a_bus_bar1_bind, | 724 | .bar1_bind = gk20a_bus_bar1_bind, |
726 | .set_bar0_window = gk20a_bus_set_bar0_window, | 725 | .set_bar0_window = gk20a_bus_set_bar0_window, |
727 | }, | 726 | }, |
727 | .ptimer = { | ||
728 | .isr = gk20a_ptimer_isr, | ||
729 | .read_ptimer = gk20a_read_ptimer, | ||
730 | .get_timestamps_zipper = nvgpu_get_timestamps_zipper, | ||
731 | }, | ||
728 | #if defined(CONFIG_GK20A_CYCLE_STATS) | 732 | #if defined(CONFIG_GK20A_CYCLE_STATS) |
729 | .css = { | 733 | .css = { |
730 | .enable_snapshot = css_hw_enable_snapshot, | 734 | .enable_snapshot = css_hw_enable_snapshot, |
@@ -806,6 +810,7 @@ int gp106_init_hal(struct gk20a *g) | |||
806 | gops->debugger = gp106_ops.debugger; | 810 | gops->debugger = gp106_ops.debugger; |
807 | gops->dbg_session_ops = gp106_ops.dbg_session_ops; | 811 | gops->dbg_session_ops = gp106_ops.dbg_session_ops; |
808 | gops->bus = gp106_ops.bus; | 812 | gops->bus = gp106_ops.bus; |
813 | gops->ptimer = gp106_ops.ptimer; | ||
809 | #if defined(CONFIG_GK20A_CYCLE_STATS) | 814 | #if defined(CONFIG_GK20A_CYCLE_STATS) |
810 | gops->css = gp106_ops.css; | 815 | gops->css = gp106_ops.css; |
811 | #endif | 816 | #endif |
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++; |