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/gk20a.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.h') diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index 8fc88677..93a5bb23 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h @@ -43,7 +43,7 @@ struct nvgpu_mem_sgt; struct nvgpu_warpstate; struct nvgpu_clk_arb; #ifdef CONFIG_GK20A_CTXSW_TRACE -struct nvgpu_ctxsw_trace_filter; +struct nvgpu_gpu_ctxsw_trace_filter; #endif struct priv_cmd_entry; @@ -894,7 +894,7 @@ struct gpu_ops { struct { int (*init)(struct gk20a *g); int (*max_entries)(struct gk20a *, - struct nvgpu_ctxsw_trace_filter *filter); + struct nvgpu_gpu_ctxsw_trace_filter *filter); int (*flush)(struct gk20a *g); int (*poll)(struct gk20a *g); int (*enable)(struct gk20a *g); @@ -911,7 +911,7 @@ struct gpu_ops { int (*mmap_user_buffer)(struct gk20a *g, struct vm_area_struct *vma); int (*set_filter)(struct gk20a *g, - struct nvgpu_ctxsw_trace_filter *filter); + struct nvgpu_gpu_ctxsw_trace_filter *filter); } fecs_trace; #endif struct { -- cgit v1.2.2