From 90568a2ce58c03f457bdd4fab6675cd327ed13fd Mon Sep 17 00:00:00 2001 From: David Nieto Date: Tue, 18 Apr 2017 21:56:09 -0700 Subject: gpu: nvgpu: allow bind to be interrupted This change solves two problems: (*) the possibility of a crash due to interrupting the gpu initialization following a bind (*) a IOVA memory leak that could prevent the GPU from binding after about 200 bind/unbind cycles A detailed list of fixes: - chek that arbiter is initialized before freeing it. - do not re-enable interrupts when MSI is enabled on unbind. - free the semaphore sea on unbind. - ensure we dont double load the vbios. - check return value of nvgpu_mutex_init for semaphores. - add corresponding nvgpu_mutex_destroy calls. bug 1816516 Change-Id: Ia8af73019e0e1183998855d55bb3eea09672a8b7 Signed-off-by: David Nieto Reviewed-on: http://git-master/r/1465302 Reviewed-by: Alex Waterman Reviewed-by: Thomas Fleury Reviewed-by: David Jarrett Reviewed-on: https://git-master.nvidia.com/r/1563019 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/clk/clk_arb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/gpu/nvgpu/clk') diff --git a/drivers/gpu/nvgpu/clk/clk_arb.c b/drivers/gpu/nvgpu/clk/clk_arb.c index 4f09da74..0df9545a 100644 --- a/drivers/gpu/nvgpu/clk/clk_arb.c +++ b/drivers/gpu/nvgpu/clk/clk_arb.c @@ -490,9 +490,9 @@ void nvgpu_clk_arb_cleanup_arbiter(struct gk20a *g) nvgpu_kfree(g, arb->vf_table_pool[index].mclk_points); } nvgpu_mutex_destroy(&g->clk_arb->pstate_lock); + nvgpu_kfree(g, g->clk_arb); + g->clk_arb = NULL; } - nvgpu_kfree(g, g->clk_arb); - g->clk_arb = NULL; } static int nvgpu_clk_arb_install_fd(struct gk20a *g, -- cgit v1.2.2