From 0271ffd77b3356582d183cafe989e12b0aa67339 Mon Sep 17 00:00:00 2001 From: Deepak Nibade Date: Thu, 25 Apr 2019 14:45:49 +0530 Subject: [PATCH] gpu: nvgpu: remove max_ctxsw_ring_buffer_size from nvgpu_gr max_ctxsw_ring_buffer_size variable in struct nvgpu_gr is used to store max ring buffer size which is then referred into linux specific code We only use macro GK20A_CTXSW_TRACE_MAX_VM_RING_SIZE to initialize the variable. And max_ctxsw_ring_buffer_size does not belong to nvgpu_gr struct anyways Considering above remove max_ctxsw_ring_buffer_size from nvgpu_gr and use macro directly in linux specific code Jira NVGPU-3125 Change-Id: Ibed9901d2bde35633d9ad0df8bd08b414e075bf4 Signed-off-by: Deepak Nibade Reviewed-on: https://git-master.nvidia.com/r/2105653 GVS: Gerrit_Virtual_Submit Reviewed-by: Vinod Gopalakrishnakurup Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/gr/gr_priv.h | 2 -- drivers/gpu/nvgpu/os/linux/fecs_trace_linux.c | 4 ---- drivers/gpu/nvgpu/os/linux/fecs_trace_linux.h | 1 + drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c | 3 ++- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/nvgpu/common/gr/gr_priv.h b/drivers/gpu/nvgpu/common/gr/gr_priv.h index 01b2f290f..f215154fa 100644 --- a/drivers/gpu/nvgpu/common/gr/gr_priv.h +++ b/drivers/gpu/nvgpu/common/gr/gr_priv.h @@ -81,8 +81,6 @@ struct nvgpu_gr { u32 fbp_en_mask; u32 *fbp_rop_l2_en_mask; - u32 max_ctxsw_ring_buffer_size; - struct nvgpu_mutex ctxsw_disable_mutex; int ctxsw_disable_count; }; diff --git a/drivers/gpu/nvgpu/os/linux/fecs_trace_linux.c b/drivers/gpu/nvgpu/os/linux/fecs_trace_linux.c index 80da007a4..000b6dbf1 100644 --- a/drivers/gpu/nvgpu/os/linux/fecs_trace_linux.c +++ b/drivers/gpu/nvgpu/os/linux/fecs_trace_linux.c @@ -35,8 +35,6 @@ #include "os_linux.h" #include "fecs_trace_linux.h" -#define GK20A_CTXSW_TRACE_MAX_VM_RING_SIZE (128*PAGE_SIZE) - /* Userland-facing FIFO (one global + eventually one per VM) */ struct gk20a_ctxsw_dev { struct gk20a *g; @@ -602,8 +600,6 @@ int gk20a_ctxsw_trace_init(struct gk20a *g) if (unlikely(err)) goto fail; - g->gr->max_ctxsw_ring_buffer_size = GK20A_CTXSW_TRACE_MAX_VM_RING_SIZE; - return 0; fail: diff --git a/drivers/gpu/nvgpu/os/linux/fecs_trace_linux.h b/drivers/gpu/nvgpu/os/linux/fecs_trace_linux.h index 39f393933..8fe769253 100644 --- a/drivers/gpu/nvgpu/os/linux/fecs_trace_linux.h +++ b/drivers/gpu/nvgpu/os/linux/fecs_trace_linux.h @@ -26,6 +26,7 @@ #include #define GK20A_CTXSW_TRACE_NUM_DEVS 1 +#define GK20A_CTXSW_TRACE_MAX_VM_RING_SIZE (128*PAGE_SIZE) struct file; struct inode; diff --git a/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c b/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c index 1ef00257a..26f826fb0 100644 --- a/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c +++ b/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c @@ -54,6 +54,7 @@ #include "dmabuf.h" #include "channel.h" #include "dmabuf_vidmem.h" +#include "fecs_trace_linux.h" #define HZ_TO_MHZ(a) ((a > 0xF414F9CD7ULL) ? 0xffff : (a >> 32) ? \ (u32) ((a * 0x10C8ULL) >> 32) : (u16) ((u32) a/MHZ)) @@ -337,7 +338,7 @@ gk20a_ctrl_ioctl_gpu_characteristics( gpu.sm_arch_warp_count = g->params.sm_arch_warp_count; gpu.max_css_buffer_size = g->ops.css.get_max_buffer_size(g);; - gpu.max_ctxsw_ring_buffer_size = g->gr->max_ctxsw_ring_buffer_size; + gpu.max_ctxsw_ring_buffer_size = GK20A_CTXSW_TRACE_MAX_VM_RING_SIZE; gpu.gpu_ioctl_nr_last = NVGPU_GPU_IOCTL_LAST; gpu.tsg_ioctl_nr_last = NVGPU_TSG_IOCTL_LAST;