From 12e23c6aad0bbb54911f0573a2ae4d3a078b862a Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Wed, 11 Oct 2017 11:55:55 -0700 Subject: gpu: nvgpu: Move function to query rl interleave Function to query interleave name depends on IOCTL flag definition. Move that code to fifo_gk20a.c to remove Linux dependency in header. Change-Id: I6d6a80e550bf30973b2be09febc2347890b77d25 Signed-off-by: Terje Bergstrom Reviewed-on: https://git-master.nvidia.com/r/1577249 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Alex Waterman GVS: Gerrit_Virtual_Submit --- drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | 17 +++++++++++++++++ drivers/gpu/nvgpu/gk20a/fifo_gk20a.h | 17 ----------------- 2 files changed, 17 insertions(+), 17 deletions(-) (limited to 'drivers/gpu') diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c index b636679e..03ca6984 100644 --- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c @@ -4048,6 +4048,23 @@ u32 gk20a_fifo_pbdma_acquire_val(u64 timeout) return val; } +const char *gk20a_fifo_interleave_level_name(u32 interleave_level) +{ + switch (interleave_level) { + case NVGPU_RUNLIST_INTERLEAVE_LEVEL_LOW: + return "LOW"; + + case NVGPU_RUNLIST_INTERLEAVE_LEVEL_MEDIUM: + return "MEDIUM"; + + case NVGPU_RUNLIST_INTERLEAVE_LEVEL_HIGH: + return "HIGH"; + + default: + return "?"; + } +} + #ifdef CONFIG_TEGRA_GK20A_NVHOST void gk20a_fifo_add_syncpt_wait_cmd(struct gk20a *g, struct priv_cmd_entry *cmd, u32 off, diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h index 68f53316..2bc7d9a8 100644 --- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h @@ -210,23 +210,6 @@ struct fifo_gk20a { u32 channel_base; }; -static inline const char *gk20a_fifo_interleave_level_name(u32 interleave_level) -{ - switch (interleave_level) { - case NVGPU_RUNLIST_INTERLEAVE_LEVEL_LOW: - return "LOW"; - - case NVGPU_RUNLIST_INTERLEAVE_LEVEL_MEDIUM: - return "MEDIUM"; - - case NVGPU_RUNLIST_INTERLEAVE_LEVEL_HIGH: - return "HIGH"; - - default: - return "?"; - } -} - struct ch_state { int pid; int refs; -- cgit v1.2.2