3 files changed, 7 insertions, 8 deletions

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 <linux/debugfs.h>
 #endif
-#include <uapi/linux/nvgpu.h>
 
 #include <nvgpu/kmem.h>
 #include <nvgpu/dma.h>
@@ -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;
diff --git a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.h b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.h
index acac14c6..8e723107 100644
--- a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.h
@@ -25,7 +25,7 @@
 
 struct gk20a;
 struct channel_gk20a;
-struct nvgpu_ctxsw_trace_filter;
+struct nvgpu_gpu_ctxsw_trace_filter;
 
 int gk20a_fecs_trace_poll(struct gk20a *g);
 int gk20a_fecs_trace_init(struct gk20a *g);
@@ -35,7 +35,7 @@ int gk20a_fecs_trace_unbind_channel(struct gk20a *g, struct channel_gk20a *ch);
 int gk20a_fecs_trace_reset(struct gk20a *g);
 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 gk20a_fecs_trace_enable(struct gk20a *g);
 int gk20a_fecs_trace_disable(struct gk20a *g);
 bool gk20a_fecs_trace_is_enabled(struct gk20a *g);
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 {