From e04e73c580976445880283552535199a70a80ea4 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Mon, 23 Nov 2015 14:17:56 -0800 Subject: gpu: nvgpu: Immediate channel release When closing channel, disable and preempt it immediately instead of waiting for it to finish all work. Bug 1683059 Change-Id: Ia5f5fc6a072dc3ddb1e9bf63534814ff0a60b5b4 Signed-off-by: Terje Bergstrom Signed-off-by: Deepak Nibade Reviewed-on: http://git-master/r/836746 --- drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/gr_gk20a.c') diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index 34ad1771..ca44cf21 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c @@ -2815,8 +2815,6 @@ out: int gk20a_free_obj_ctx(struct channel_gk20a *c, struct nvgpu_free_obj_ctx_args *args) { - unsigned long timeout = gk20a_get_gr_idle_timeout(c->g); - gk20a_dbg_fn(""); if (c->num_objects == 0) @@ -2826,9 +2824,7 @@ int gk20a_free_obj_ctx(struct channel_gk20a *c, if (c->num_objects == 0) { c->first_init = false; - gk20a_disable_channel(c, - !c->has_timedout, - timeout); + gk20a_disable_channel(c); gr_gk20a_free_channel_patch_ctx(c); } -- cgit v1.2.2