From 064ba6a7ef236a7bb1085715c6ab37810f230bbf Mon Sep 17 00:00:00 2001 From: Vaibhav Kachore Date: Mon, 20 Aug 2018 15:25:06 +0530 Subject: gpu: nvgpu: convert linux nvgpu ctxsw tags Convert linux nvgpu ctxsw tags type of the form of NVGPU_CTXSW_TAG_* into common nvgpu ctxsw tags type of the form of NVGPU_GPU_CTXSW_TAG_* EVLR-3078 Change-Id: I337487722c103c05003457f74ad6e05bf3bd38fc Signed-off-by: Vaibhav Kachore Reviewed-on: https://git-master.nvidia.com/r/1803209 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c') diff --git a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c index 50077a62..e775c10b 100644 --- a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c @@ -308,27 +308,27 @@ static int gk20a_fecs_trace_ring_read(struct gk20a *g, int index) entry.tag, entry.timestamp, r->context_id, r->new_context_id); - switch (entry.tag) { - case NVGPU_CTXSW_TAG_RESTORE_START: - case NVGPU_CTXSW_TAG_CONTEXT_START: + switch (nvgpu_gpu_ctxsw_tags_to_common_tags(entry.tag)) { + case NVGPU_GPU_CTXSW_TAG_RESTORE_START: + case NVGPU_GPU_CTXSW_TAG_CONTEXT_START: entry.context_id = r->new_context_id; entry.pid = new_pid; break; - case NVGPU_CTXSW_TAG_CTXSW_REQ_BY_HOST: - case NVGPU_CTXSW_TAG_FE_ACK: - case NVGPU_CTXSW_TAG_FE_ACK_WFI: - case NVGPU_CTXSW_TAG_FE_ACK_GFXP: - case NVGPU_CTXSW_TAG_FE_ACK_CTAP: - case NVGPU_CTXSW_TAG_FE_ACK_CILP: - case NVGPU_CTXSW_TAG_SAVE_END: + case NVGPU_GPU_CTXSW_TAG_CTXSW_REQ_BY_HOST: + case NVGPU_GPU_CTXSW_TAG_FE_ACK: + case NVGPU_GPU_CTXSW_TAG_FE_ACK_WFI: + case NVGPU_GPU_CTXSW_TAG_FE_ACK_GFXP: + case NVGPU_GPU_CTXSW_TAG_FE_ACK_CTAP: + case NVGPU_GPU_CTXSW_TAG_FE_ACK_CILP: + case NVGPU_GPU_CTXSW_TAG_SAVE_END: entry.context_id = r->context_id; entry.pid = cur_pid; break; default: /* tags are not guaranteed to start at the beginning */ - WARN_ON(entry.tag && (entry.tag != NVGPU_CTXSW_TAG_INVALID_TIMESTAMP)); + WARN_ON(entry.tag && (entry.tag != NVGPU_GPU_CTXSW_TAG_INVALID_TIMESTAMP)); continue; } -- cgit v1.2.2