From 7bf2833f340f87ea643d3ef66b0e4c22ffb1e891 Mon Sep 17 00:00:00 2001 From: Sagar Kamble Date: Sun, 8 Nov 2020 22:16:44 +0530 Subject: gpu: nvgpu: do tsg unbind hw state check only for multi-channel TSG Host scheduler might be confused if more than one channels are present in TSG and one of the unbound channel has NEXT set. This is not so much of an issue if there is single channel in the TSG. So don't fail unbind in that case. ctx_reload and engine_faulted check can also be skipped for single channel TSG. Bug 3144960 Change-Id: I85eb9025ea53706ce8fda6d9b4bcf6a15a300d17 Signed-off-by: Sagar Kamble Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2442970 (cherry picked from commit ad4624aae3f109fc3c8c03653cb691e09f086930) Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2445445 Tested-by: mobile promotions Reviewed-by: automaticguardword Reviewed-by: svc-mobile-coverity Reviewed-by: Bibek Basu Reviewed-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'drivers/gpu/nvgpu/gk20a') diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c index 4d62d8e9..072f1777 100644 --- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c @@ -2212,6 +2212,22 @@ int gk20a_fifo_tsg_unbind_channel_verify_status(struct channel_gk20a *ch) return 0; } +static bool gk20a_fifo_tsg_is_multi_channel(struct tsg_gk20a *tsg) +{ + bool ret = false; + + nvgpu_rwsem_down_read(&tsg->ch_list_lock); + if (nvgpu_list_first_entry(&tsg->ch_list, channel_gk20a, + ch_entry) != + nvgpu_list_last_entry(&tsg->ch_list, channel_gk20a, + ch_entry)) { + ret = true; + } + nvgpu_rwsem_up_read(&tsg->ch_list_lock); + + return ret; +} + int gk20a_fifo_tsg_unbind_channel(struct channel_gk20a *ch) { struct gk20a *g = ch->g; @@ -2237,7 +2253,12 @@ int gk20a_fifo_tsg_unbind_channel(struct channel_gk20a *ch) goto fail_enable_tsg; } - if (g->ops.fifo.tsg_verify_channel_status && !tsg_timedout) { + /* + * State validation is only necessary if there are multiple channels in + * the TSG. + */ + if (gk20a_fifo_tsg_is_multi_channel(tsg) && + g->ops.fifo.tsg_verify_channel_status && !tsg_timedout) { err = g->ops.fifo.tsg_verify_channel_status(ch); if (err) { goto fail_enable_tsg; -- cgit v1.2.2