diff options
author | Vaibhav Kachore <vkachore@nvidia.com> | 2018-08-20 07:29:45 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-08-31 15:16:19 -0400 |
commit | 7bf80a1c69a07f81225270e90a57a1c41d202859 (patch) | |
tree | 278ed4c9197997734bac69b5695a559ec5278082 /drivers/gpu/nvgpu/gk20a | |
parent | 064ba6a7ef236a7bb1085715c6ab37810f230bbf (diff) |
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 <vkachore@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1803210
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c | 5 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.h | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 6 |
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 @@ | |||
23 | #ifdef CONFIG_DEBUG_FS | 23 | #ifdef CONFIG_DEBUG_FS |
24 | #include <linux/debugfs.h> | 24 | #include <linux/debugfs.h> |
25 | #endif | 25 | #endif |
26 | #include <uapi/linux/nvgpu.h> | ||
27 | 26 | ||
28 | #include <nvgpu/kmem.h> | 27 | #include <nvgpu/kmem.h> |
29 | #include <nvgpu/dma.h> | 28 | #include <nvgpu/dma.h> |
@@ -738,14 +737,14 @@ int gk20a_fecs_trace_deinit(struct gk20a *g) | |||
738 | } | 737 | } |
739 | 738 | ||
740 | int gk20a_gr_max_entries(struct gk20a *g, | 739 | int gk20a_gr_max_entries(struct gk20a *g, |
741 | struct nvgpu_ctxsw_trace_filter *filter) | 740 | struct nvgpu_gpu_ctxsw_trace_filter *filter) |
742 | { | 741 | { |
743 | int n; | 742 | int n; |
744 | int tag; | 743 | int tag; |
745 | 744 | ||
746 | /* Compute number of entries per record, with given filter */ | 745 | /* Compute number of entries per record, with given filter */ |
747 | for (n = 0, tag = 0; tag < gk20a_fecs_trace_num_ts(); tag++) | 746 | for (n = 0, tag = 0; tag < gk20a_fecs_trace_num_ts(); tag++) |
748 | n += (NVGPU_CTXSW_FILTER_ISSET(tag, filter) != 0); | 747 | n += (NVGPU_GPU_CTXSW_FILTER_ISSET(tag, filter) != 0); |
749 | 748 | ||
750 | /* Return max number of entries generated for the whole ring */ | 749 | /* Return max number of entries generated for the whole ring */ |
751 | return n * GK20A_FECS_TRACE_NUM_RECORDS; | 750 | 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 @@ | |||
25 | 25 | ||
26 | struct gk20a; | 26 | struct gk20a; |
27 | struct channel_gk20a; | 27 | struct channel_gk20a; |
28 | struct nvgpu_ctxsw_trace_filter; | 28 | struct nvgpu_gpu_ctxsw_trace_filter; |
29 | 29 | ||
30 | int gk20a_fecs_trace_poll(struct gk20a *g); | 30 | int gk20a_fecs_trace_poll(struct gk20a *g); |
31 | int gk20a_fecs_trace_init(struct gk20a *g); | 31 | 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); | |||
35 | int gk20a_fecs_trace_reset(struct gk20a *g); | 35 | int gk20a_fecs_trace_reset(struct gk20a *g); |
36 | int gk20a_fecs_trace_deinit(struct gk20a *g); | 36 | int gk20a_fecs_trace_deinit(struct gk20a *g); |
37 | int gk20a_gr_max_entries(struct gk20a *g, | 37 | int gk20a_gr_max_entries(struct gk20a *g, |
38 | struct nvgpu_ctxsw_trace_filter *filter); | 38 | struct nvgpu_gpu_ctxsw_trace_filter *filter); |
39 | int gk20a_fecs_trace_enable(struct gk20a *g); | 39 | int gk20a_fecs_trace_enable(struct gk20a *g); |
40 | int gk20a_fecs_trace_disable(struct gk20a *g); | 40 | int gk20a_fecs_trace_disable(struct gk20a *g); |
41 | bool gk20a_fecs_trace_is_enabled(struct gk20a *g); | 41 | 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; | |||
43 | struct nvgpu_warpstate; | 43 | struct nvgpu_warpstate; |
44 | struct nvgpu_clk_arb; | 44 | struct nvgpu_clk_arb; |
45 | #ifdef CONFIG_GK20A_CTXSW_TRACE | 45 | #ifdef CONFIG_GK20A_CTXSW_TRACE |
46 | struct nvgpu_ctxsw_trace_filter; | 46 | struct nvgpu_gpu_ctxsw_trace_filter; |
47 | #endif | 47 | #endif |
48 | struct priv_cmd_entry; | 48 | struct priv_cmd_entry; |
49 | 49 | ||
@@ -894,7 +894,7 @@ struct gpu_ops { | |||
894 | struct { | 894 | struct { |
895 | int (*init)(struct gk20a *g); | 895 | int (*init)(struct gk20a *g); |
896 | int (*max_entries)(struct gk20a *, | 896 | int (*max_entries)(struct gk20a *, |
897 | struct nvgpu_ctxsw_trace_filter *filter); | 897 | struct nvgpu_gpu_ctxsw_trace_filter *filter); |
898 | int (*flush)(struct gk20a *g); | 898 | int (*flush)(struct gk20a *g); |
899 | int (*poll)(struct gk20a *g); | 899 | int (*poll)(struct gk20a *g); |
900 | int (*enable)(struct gk20a *g); | 900 | int (*enable)(struct gk20a *g); |
@@ -911,7 +911,7 @@ struct gpu_ops { | |||
911 | int (*mmap_user_buffer)(struct gk20a *g, | 911 | int (*mmap_user_buffer)(struct gk20a *g, |
912 | struct vm_area_struct *vma); | 912 | struct vm_area_struct *vma); |
913 | int (*set_filter)(struct gk20a *g, | 913 | int (*set_filter)(struct gk20a *g, |
914 | struct nvgpu_ctxsw_trace_filter *filter); | 914 | struct nvgpu_gpu_ctxsw_trace_filter *filter); |
915 | } fecs_trace; | 915 | } fecs_trace; |
916 | #endif | 916 | #endif |
917 | struct { | 917 | struct { |