summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gp106/clk_gp106.c
diff options
context:
space:
mode:
authorDeepak Nibade <dnibade@nvidia.com>2017-01-24 08:30:42 -0500
committermobile promotions <svcmobile_promotions@nvidia.com>2017-02-22 07:15:02 -0500
commit8ee3aa4b3175d8d27e57a0f5d5e2cdf3d78a4a58 (patch)
tree505dfd2ea2aca2f1cbdb254baee980862d21e04d /drivers/gpu/nvgpu/gp106/clk_gp106.c
parent1f855af63fdd31fe3dcfee75f4f5f9b62f30d87e (diff)
gpu: nvgpu: use common nvgpu mutex/spinlock APIs
Instead of using Linux APIs for mutex and spinlocks directly, use new APIs defined in <nvgpu/lock.h> Replace Linux specific mutex/spinlock declaration, init, lock, unlock APIs with new APIs e.g struct mutex is replaced by struct nvgpu_mutex and mutex_lock() is replaced by nvgpu_mutex_acquire() And also include <nvgpu/lock.h> instead of including <linux/mutex.h> and <linux/spinlock.h> Add explicit nvgpu/lock.h includes to below files to fix complilation failures. gk20a/platform_gk20a.h include/nvgpu/allocator.h Jira NVGPU-13 Change-Id: I81a05d21ecdbd90c2076a9f0aefd0e40b215bd33 Signed-off-by: Deepak Nibade <dnibade@nvidia.com> Reviewed-on: http://git-master/r/1293187 Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gp106/clk_gp106.c')
-rw-r--r--drivers/gpu/nvgpu/gp106/clk_gp106.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gp106/clk_gp106.c b/drivers/gpu/nvgpu/gp106/clk_gp106.c
index edeb97ec..3b9c444d 100644
--- a/drivers/gpu/nvgpu/gp106/clk_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/clk_gp106.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * GP106 Clocks 2 * GP106 Clocks
3 * 3 *
4 * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. 4 * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved.
5 * 5 *
6 * This program is free software; you can redistribute it and/or modify it 6 * This program is free software; you can redistribute it and/or modify it
7 * under the terms and conditions of the GNU General Public License, 7 * under the terms and conditions of the GNU General Public License,
@@ -79,7 +79,7 @@ static int gp106_init_clk_support(struct gk20a *g) {
79 79
80 gk20a_dbg_fn(""); 80 gk20a_dbg_fn("");
81 81
82 mutex_init(&clk->clk_mutex); 82 nvgpu_mutex_init(&clk->clk_mutex);
83 83
84 clk->clk_namemap = (struct namemap_cfg *) 84 clk->clk_namemap = (struct namemap_cfg *)
85 kzalloc(sizeof(struct namemap_cfg) * NUM_NAMEMAPS, GFP_KERNEL); 85 kzalloc(sizeof(struct namemap_cfg) * NUM_NAMEMAPS, GFP_KERNEL);
@@ -169,7 +169,7 @@ static u32 gp106_get_rate_cntr(struct gk20a *g, struct namemap_cfg *c) {
169 if (!c || !c->cntr.reg_ctrl_addr || !c->cntr.reg_cntr_addr) 169 if (!c || !c->cntr.reg_ctrl_addr || !c->cntr.reg_cntr_addr)
170 return 0; 170 return 0;
171 171
172 mutex_lock(&clk->clk_mutex); 172 nvgpu_mutex_acquire(&clk->clk_mutex);
173 173
174 /* Save the register */ 174 /* Save the register */
175 save_reg = gk20a_readl(g, c->cntr.reg_ctrl_addr); 175 save_reg = gk20a_readl(g, c->cntr.reg_ctrl_addr);
@@ -216,7 +216,7 @@ read_err:
216 gk20a_readl(g, c->cntr.reg_ctrl_addr); 216 gk20a_readl(g, c->cntr.reg_ctrl_addr);
217 gk20a_writel(g, c->cntr.reg_ctrl_addr, save_reg); 217 gk20a_writel(g, c->cntr.reg_ctrl_addr, save_reg);
218 gk20a_readl(g, c->cntr.reg_ctrl_addr); 218 gk20a_readl(g, c->cntr.reg_ctrl_addr);
219 mutex_unlock(&clk->clk_mutex); 219 nvgpu_mutex_release(&clk->clk_mutex);
220 220
221 return cntr; 221 return cntr;
222 222