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 <nvgpu/types.h>
 
 #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;