summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/ce2_gk20a.h
diff options
context:
space:
mode:
authorKonsta Holtta <kholtta@nvidia.com>2017-10-31 07:07:08 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-11-07 20:10:57 -0500
commit760f8dd7fbbfaee7607d10c38fe013f9cb069cd7 (patch)
tree34239151105624cefd782798785fd442c67833fa /drivers/gpu/nvgpu/gk20a/ce2_gk20a.h
parent295ade2f1ea76f2cf61ab93465d251cabb681f49 (diff)
gpu: nvgpu: drop user callback support in CE
Simplify the copyengine code by deleting support for the ce_event_callback feature that has never been used. Similarly, create a channel without the finish callback to get rid of that Linux dependency, and delete the finish callback function as it now serves no purpose. Delete also the submitted_seq_number and completed_seq_number fields that are only written to. Jira NVGPU-259 Change-Id: I02d15bdcb546f4dd8895a6bfb5130caf88a104e2 Signed-off-by: Konsta Holtta <kholtta@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1589320 Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Deepak Nibade <dnibade@nvidia.com> Reviewed-by: Alex Waterman <alexw@nvidia.com> Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/ce2_gk20a.h')
-rw-r--r--drivers/gpu/nvgpu/gk20a/ce2_gk20a.h19
1 files changed, 2 insertions, 17 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.h b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.h
index 8d3a4ca3..5c3a1cfc 100644
--- a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.h
@@ -40,8 +40,6 @@ int gk20a_ce2_nonstall_isr(struct gk20a *g, u32 inst_id, u32 pri_base);
40#define NVGPU_CE_MAX_COMMAND_BUFF_SIZE_PER_KICKOFF 256 40#define NVGPU_CE_MAX_COMMAND_BUFF_SIZE_PER_KICKOFF 256
41#define NVGPU_CE_MAX_COMMAND_BUFF_SIZE_FOR_TRACING 8 41#define NVGPU_CE_MAX_COMMAND_BUFF_SIZE_FOR_TRACING 8
42 42
43typedef void (*ce_event_callback)(u32 ce_ctx_id, u32 ce_event_flag);
44
45/* dma launch_flags */ 43/* dma launch_flags */
46enum { 44enum {
47 /* location */ 45 /* location */
@@ -69,14 +67,6 @@ enum {
69 NVGPU_CE_MEMSET = (1 << 1), 67 NVGPU_CE_MEMSET = (1 << 1),
70}; 68};
71 69
72/* CE event flags */
73enum {
74 NVGPU_CE_CONTEXT_JOB_COMPLETED = (1 << 0),
75 NVGPU_CE_CONTEXT_JOB_TIMEDOUT = (1 << 1),
76 NVGPU_CE_CONTEXT_SUSPEND = (1 << 2),
77 NVGPU_CE_CONTEXT_RESUME = (1 << 3),
78};
79
80/* CE app state machine flags */ 70/* CE app state machine flags */
81enum { 71enum {
82 NVGPU_CE_ACTIVE = (1 << 0), 72 NVGPU_CE_ACTIVE = (1 << 0),
@@ -106,7 +96,6 @@ struct gk20a_gpu_ctx {
106 u32 ctx_id; 96 u32 ctx_id;
107 struct nvgpu_mutex gpu_ctx_mutex; 97 struct nvgpu_mutex gpu_ctx_mutex;
108 int gpu_ctx_state; 98 int gpu_ctx_state;
109 ce_event_callback user_event_callback;
110 99
111 /* tsg related data */ 100 /* tsg related data */
112 struct tsg_gk20a *tsg; 101 struct tsg_gk20a *tsg;
@@ -120,9 +109,6 @@ struct gk20a_gpu_ctx {
120 109
121 struct nvgpu_list_node list; 110 struct nvgpu_list_node list;
122 111
123 u64 submitted_seq_number;
124 u64 completed_seq_number;
125
126 u32 cmd_buf_read_queue_offset; 112 u32 cmd_buf_read_queue_offset;
127 u32 cmd_buf_end_queue_offset; 113 u32 cmd_buf_end_queue_offset;
128}; 114};
@@ -140,12 +126,11 @@ void gk20a_ce_suspend(struct gk20a *g);
140void gk20a_ce_destroy(struct gk20a *g); 126void gk20a_ce_destroy(struct gk20a *g);
141 127
142/* CE app utility functions */ 128/* CE app utility functions */
143u32 gk20a_ce_create_context_with_cb(struct gk20a *g, 129u32 gk20a_ce_create_context(struct gk20a *g,
144 int runlist_id, 130 int runlist_id,
145 int priority, 131 int priority,
146 int timeslice, 132 int timeslice,
147 int runlist_level, 133 int runlist_level);
148 ce_event_callback user_event_callback);
149int gk20a_ce_execute_ops(struct gk20a *g, 134int gk20a_ce_execute_ops(struct gk20a *g,
150 u32 ce_ctx_id, 135 u32 ce_ctx_id,
151 u64 src_buf, 136 u64 src_buf,