summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gm20b/acr_gm20b.c
diff options
context:
space:
mode:
authorDeepak Nibade <dnibade@nvidia.com>2014-08-06 02:33:45 -0400
committerDan Willemsen <dwillemsen@nvidia.com>2015-03-18 15:10:47 -0400
commit2489960344b02fb8ca8f725a481ead527bb0da49 (patch)
tree5c7ceb0b69575f18175ecb6e5c5b30f7f11f7e39 /drivers/gpu/nvgpu/gm20b/acr_gm20b.c
parentfff31d310c03a6e34234a133df694d4e4d777754 (diff)
gpu: nvgpu: remove redundant lock
"isr_enable_lock" was used to protect pmu's isr_enabled flag and pmu enable/disable calls Instead of this extra lock, we can reuse "isr_mutex" for this purpose Bug 200014542 Bug 200014887 Change-Id: Ifbb7d6108effc132266a20517820e470d52a7110 Signed-off-by: Deepak Nibade <dnibade@nvidia.com> Reviewed-on: http://git-master/r/453348 Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com> Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gm20b/acr_gm20b.c')
-rw-r--r--drivers/gpu/nvgpu/gm20b/acr_gm20b.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c
index 92a89f00..4ef25a13 100644
--- a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c
@@ -1085,10 +1085,10 @@ int gm20b_init_pmu_setup_hw1(struct gk20a *g, struct flcn_bl_dmem_desc *desc,
1085 int err; 1085 int err;
1086 1086
1087 gk20a_dbg_fn(""); 1087 gk20a_dbg_fn("");
1088 mutex_lock(&pmu->isr_enable_lock); 1088 mutex_lock(&pmu->isr_mutex);
1089 pmu_reset(pmu); 1089 pmu_reset(pmu);
1090 pmu->isr_enabled = true; 1090 pmu->isr_enabled = true;
1091 mutex_unlock(&pmu->isr_enable_lock); 1091 mutex_unlock(&pmu->isr_mutex);
1092 1092
1093 /* setup apertures - virtual */ 1093 /* setup apertures - virtual */
1094 gk20a_writel(g, pwr_fbif_transcfg_r(GK20A_PMU_DMAIDX_UCODE), 1094 gk20a_writel(g, pwr_fbif_transcfg_r(GK20A_PMU_DMAIDX_UCODE),