summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gp106/clk_arb_gp106.c
diff options
context:
space:
mode:
authorDebarshi Dutta <ddutta@nvidia.com>2018-09-03 01:21:02 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2018-09-04 10:25:45 -0400
commitbac38f52cc6f2ddc435a748dd9c85f3c5d88153f (patch)
treeb53198fc14aa9d470d41b5d36caee934ef8c5bbc /drivers/gpu/nvgpu/gp106/clk_arb_gp106.c
parent16ad9f537979c5f3717fc5781b1c2fad22a76f96 (diff)
gpu: nvgpu: protect clk_arb init with mutex.
g->clk_arb is currently initialized as a part of gk20a_finalize_poweron(). Any subsequent call to gk20a_finalize_poweron reinitializes the clk_arb and leading to memory leaks. This is resolved by protecting the g->clk_arb initialization with a mutex clk_arb_enable_lock in struct gk20a. We skip initializing the g->clk_arb if its not NULL. Bug 2061372 Change-Id: I59158e0a5e4c827fdbd6d9ea2d04c78d0986347a Signed-off-by: Debarshi Dutta <ddutta@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1811650 Reviewed-by: Deepak Nibade <dnibade@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com> Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gp106/clk_arb_gp106.c')
-rw-r--r--drivers/gpu/nvgpu/gp106/clk_arb_gp106.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gp106/clk_arb_gp106.c b/drivers/gpu/nvgpu/gp106/clk_arb_gp106.c
index 860344d0..001f2bfc 100644
--- a/drivers/gpu/nvgpu/gp106/clk_arb_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/clk_arb_gp106.c
@@ -121,6 +121,10 @@ int gp106_init_clk_arbiter(struct gk20a *g)
121 121
122 clk_arb_dbg(g, " "); 122 clk_arb_dbg(g, " ");
123 123
124 if (g->clk_arb != NULL) {
125 return 0;
126 }
127
124 arb = nvgpu_kzalloc(g, sizeof(struct nvgpu_clk_arb)); 128 arb = nvgpu_kzalloc(g, sizeof(struct nvgpu_clk_arb));
125 if (!arb) 129 if (!arb)
126 return -ENOMEM; 130 return -ENOMEM;