From 7bf80a1c69a07f81225270e90a57a1c41d202859 Mon Sep 17 00:00:00 2001 From: Vaibhav Kachore Date: Mon, 20 Aug 2018 16:59:45 +0530 Subject: gpu: nvgpu: remove use of NVGPU_CTXSW_FILTER_ISSET - Remove the usage of NVGPU_CTXSW_FILTER_ISSET splattered across nvgpu, and replace with a MACRO defined in common code. The usage is still inside Linux, but this helps the subsequent unification efforts, e.g. to unify the fecs trace path. - Remove "uapi/linux/nvgpu.h" from common code. EVLR-3078 Change-Id: I60b0e1627576a4b255671d58530d8c773ea6154c Signed-off-by: Vaibhav Kachore Reviewed-on: https://git-master.nvidia.com/r/1803210 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c | 5 ++--- 1 file changed, 2 insertions(+), 3 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 e775c10b..453d5b2f 100644 --- a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c @@ -23,7 +23,6 @@ #ifdef CONFIG_DEBUG_FS #include #endif -#include #include #include @@ -738,14 +737,14 @@ int gk20a_fecs_trace_deinit(struct gk20a *g) } int gk20a_gr_max_entries(struct gk20a *g, - struct nvgpu_ctxsw_trace_filter *filter) + struct nvgpu_gpu_ctxsw_trace_filter *filter) { int n; int tag; /* Compute number of entries per record, with given filter */ for (n = 0, tag = 0; tag < gk20a_fecs_trace_num_ts(); tag++) - n += (NVGPU_CTXSW_FILTER_ISSET(tag, filter) != 0); + n += (NVGPU_GPU_CTXSW_FILTER_ISSET(tag, filter) != 0); /* Return max number of entries generated for the whole ring */ return n * GK20A_FECS_TRACE_NUM_RECORDS; -- cgit v1.2.2