From ad6b7d419b86ee97e894b1dce068934400c9428b Mon Sep 17 00:00:00 2001 From: Konsta Holtta Date: Tue, 23 Oct 2018 13:06:12 +0300 Subject: [PATCH] gpu: nvgpu: unify channel status dump styles Add tsgid to older chips' dump where it was missing and add the deterministic flag to newer chips' dump where it was missing. Jira NVGPU-886 Change-Id: Ia21d7c6709ee2863293c48dc0c04a1e4b8783963 Signed-off-by: Konsta Holtta Reviewed-on: https://git-master.nvidia.com/r/1933492 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | 3 ++- drivers/gpu/nvgpu/gv11b/fifo_gv11b.c | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c index df55b2482..cfc3490b7 100644 --- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c @@ -4111,9 +4111,10 @@ void gk20a_dump_channel_status_ramfc(struct gk20a *g, syncpointa = info->inst.syncpointa; syncpointb = info->inst.syncpointb; - gk20a_debug_output(o, "%d-%s, pid %d, refs %d%s: ", + gk20a_debug_output(o, "%d-%s, TSG: %u, pid %d, refs %d%s: ", info->chid, g->name, + info->tsgid, info->pid, info->refs, info->deterministic ? ", deterministic" : ""); diff --git a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c index c7d8005e3..6dad208ee 100644 --- a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c @@ -336,12 +336,13 @@ void gv11b_dump_channel_status_ramfc(struct gk20a *g, status = ccsr_channel_status_v(info->channel_reg); - gk20a_debug_output(o, "%d-%s, TSG: %u, pid %d, refs: %d: ", + gk20a_debug_output(o, "%d-%s, TSG: %u, pid %d, refs: %d%s: ", info->chid, g->name, info->tsgid, info->pid, - info->refs); + info->refs, + info->deterministic ? ", deterministic" : ""); gk20a_debug_output(o, "channel status: %s in use %s %s\n", ccsr_channel_enable_v(info->channel_reg) ? "" : "not", gk20a_decode_ccsr_chan_status(status),