summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/clk
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2017-03-17 14:09:44 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-03-23 11:44:07 -0400
commit4492c62ffe9398bd4457f6f1c2773e40afe909fb (patch)
tree5d792f81d97844278f4eca665a8b4778fa93dc35 /drivers/gpu/nvgpu/clk
parent33f637585ecd617a9f4423f56e2aa6df0691ac64 (diff)
gpu: nvgpu: Add bus HAL
Add bus HAL and move all bus related hardware sequencing to that file: BAR1 binding, timer access, and interrupt handling. Change-Id: Ibc5f5797dc338de10749b446a7bdbcae600fecb4 Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: http://git-master/r/1323353 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.c4
-rw-r--r--drivers/gpu/nvgpu/clk/clk_mclk.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/clk/clk_arb.c b/drivers/gpu/nvgpu/clk/clk_arb.c
index 30447d3e..fc821235 100644
--- a/drivers/gpu/nvgpu/clk/clk_arb.c
+++ b/drivers/gpu/nvgpu/clk/clk_arb.c
@@ -1062,7 +1062,7 @@ static void nvgpu_clk_arb_run_arbiter_cb(struct work_struct *work)
1062 goto exit_arb; 1062 goto exit_arb;
1063 1063
1064#ifdef CONFIG_DEBUG_FS 1064#ifdef CONFIG_DEBUG_FS
1065 g->ops.read_ptimer(g, &t0); 1065 g->ops.bus.read_ptimer(g, &t0);
1066#endif 1066#endif
1067 1067
1068 /* Only one arbiter should be running */ 1068 /* Only one arbiter should be running */
@@ -1248,7 +1248,7 @@ static void nvgpu_clk_arb_run_arbiter_cb(struct work_struct *work)
1248 wake_up_interruptible(&arb->request_wq); 1248 wake_up_interruptible(&arb->request_wq);
1249 1249
1250#ifdef CONFIG_DEBUG_FS 1250#ifdef CONFIG_DEBUG_FS
1251 g->ops.read_ptimer(g, &t1); 1251 g->ops.bus.read_ptimer(g, &t1);
1252 1252
1253 debug = arb->debug == &arb->debug_pool[0] ? 1253 debug = arb->debug == &arb->debug_pool[0] ?
1254 &arb->debug_pool[1] : &arb->debug_pool[0]; 1254 &arb->debug_pool[1] : &arb->debug_pool[0];
diff --git a/drivers/gpu/nvgpu/clk/clk_mclk.c b/drivers/gpu/nvgpu/clk/clk_mclk.c
index c2e9b35c..e5452051 100644
--- a/drivers/gpu/nvgpu/clk/clk_mclk.c
+++ b/drivers/gpu/nvgpu/clk/clk_mclk.c
@@ -2311,7 +2311,7 @@ int clk_mclkseq_change_mclk_gddr5(struct gk20a *g, u16 val)
2311 pseq_cmd->cmd_type = NV_PMU_SEQ_CMD_ID_RUN_SCRIPT; 2311 pseq_cmd->cmd_type = NV_PMU_SEQ_CMD_ID_RUN_SCRIPT;
2312 2312
2313#ifdef CONFIG_DEBUG_FS 2313#ifdef CONFIG_DEBUG_FS
2314 g->ops.read_ptimer(g, &t0); 2314 g->ops.bus.read_ptimer(g, &t0);
2315#endif 2315#endif
2316 2316
2317 if (speed == gk20a_mclk_high_speed) { 2317 if (speed == gk20a_mclk_high_speed) {
@@ -2362,7 +2362,7 @@ int clk_mclkseq_change_mclk_gddr5(struct gk20a *g, u16 val)
2362 mclk->speed = speed; 2362 mclk->speed = speed;
2363 2363
2364#ifdef CONFIG_DEBUG_FS 2364#ifdef CONFIG_DEBUG_FS
2365 g->ops.read_ptimer(g, &t1); 2365 g->ops.bus.read_ptimer(g, &t1);
2366 2366
2367 nvgpu_mutex_acquire(&mclk->data_lock); 2367 nvgpu_mutex_acquire(&mclk->data_lock);
2368 mclk->switch_num++; 2368 mclk->switch_num++;