From 760f8dd7fbbfaee7607d10c38fe013f9cb069cd7 Mon Sep 17 00:00:00 2001 From: Konsta Holtta Date: Tue, 31 Oct 2017 13:07:08 +0200 Subject: 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 Reviewed-on: https://git-master.nvidia.com/r/1589320 Reviewed-by: svc-mobile-coverity GVS: Gerrit_Virtual_Submit Reviewed-by: Deepak Nibade Reviewed-by: Alex Waterman Reviewed-by: Terje Bergstrom Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/ce2_gk20a.h | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/ce2_gk20a.h') 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); #define NVGPU_CE_MAX_COMMAND_BUFF_SIZE_PER_KICKOFF 256 #define NVGPU_CE_MAX_COMMAND_BUFF_SIZE_FOR_TRACING 8 -typedef void (*ce_event_callback)(u32 ce_ctx_id, u32 ce_event_flag); - /* dma launch_flags */ enum { /* location */ @@ -69,14 +67,6 @@ enum { NVGPU_CE_MEMSET = (1 << 1), }; -/* CE event flags */ -enum { - NVGPU_CE_CONTEXT_JOB_COMPLETED = (1 << 0), - NVGPU_CE_CONTEXT_JOB_TIMEDOUT = (1 << 1), - NVGPU_CE_CONTEXT_SUSPEND = (1 << 2), - NVGPU_CE_CONTEXT_RESUME = (1 << 3), -}; - /* CE app state machine flags */ enum { NVGPU_CE_ACTIVE = (1 << 0), @@ -106,7 +96,6 @@ struct gk20a_gpu_ctx { u32 ctx_id; struct nvgpu_mutex gpu_ctx_mutex; int gpu_ctx_state; - ce_event_callback user_event_callback; /* tsg related data */ struct tsg_gk20a *tsg; @@ -120,9 +109,6 @@ struct gk20a_gpu_ctx { struct nvgpu_list_node list; - u64 submitted_seq_number; - u64 completed_seq_number; - u32 cmd_buf_read_queue_offset; u32 cmd_buf_end_queue_offset; }; @@ -140,12 +126,11 @@ void gk20a_ce_suspend(struct gk20a *g); void gk20a_ce_destroy(struct gk20a *g); /* CE app utility functions */ -u32 gk20a_ce_create_context_with_cb(struct gk20a *g, +u32 gk20a_ce_create_context(struct gk20a *g, int runlist_id, int priority, int timeslice, - int runlist_level, - ce_event_callback user_event_callback); + int runlist_level); int gk20a_ce_execute_ops(struct gk20a *g, u32 ce_ctx_id, u64 src_buf, -- cgit v1.2.2