From 06780e0681b34ec570346fe5d4bdaf7a23f08a36 Mon Sep 17 00:00:00 2001 From: Richard Zhao Date: Tue, 16 Aug 2016 14:24:34 -0700 Subject: gpu: nvgpu: vgpu: fix channel abort set timeout for channel force reset, to prevent submit immediately. Bug 1778448 JIRA VFND-2097 Change-Id: I729597a68cbdc5ed3f6c878955a10ae7c4659fa4 Signed-off-by: Richard Zhao Reviewed-on: http://git-master/r/1203298 GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/vgpu/fifo_vgpu.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'drivers/gpu/nvgpu/vgpu/fifo_vgpu.c') diff --git a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c index 90e44e8c..a797bad4 100644 --- a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c @@ -655,6 +655,7 @@ static int vgpu_fifo_force_reset_ch(struct channel_gk20a *ch, list_for_each_entry(ch_tsg, &tsg->ch_list, ch_entry) { if (gk20a_channel_get(ch_tsg)) { gk20a_set_error_notifier(ch_tsg, err_code); + ch_tsg->has_timedout = true; gk20a_channel_put(ch_tsg); } } @@ -662,6 +663,7 @@ static int vgpu_fifo_force_reset_ch(struct channel_gk20a *ch, mutex_unlock(&tsg->ch_list_lock); } else { gk20a_set_error_notifier(ch, err_code); + ch->has_timedout = true; } msg.cmd = TEGRA_VGPU_CMD_CHANNEL_FORCE_RESET; -- cgit v1.2.2