diff --git a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c
index 1c351d9e6..1397549ec 100644
--- a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c
@@ -449,6 +449,22 @@ static int nvgpu_dbg_gpu_ioctl_timeout(struct dbg_session_gk20a *dbg_s,
 	return err;
 }
 
+static void nvgpu_dbg_gpu_ioctl_get_timeout(struct dbg_session_gk20a *dbg_s,
+			 struct nvgpu_dbg_gpu_timeout_args *args)
+{
+	int status;
+	struct gk20a *g = get_gk20a(dbg_s->pdev);
+
+	mutex_lock(&g->dbg_sessions_lock);
+	status = g->timeouts_enabled;
+	mutex_unlock(&g->dbg_sessions_lock);
+
+	if (status)
+		args->enable = NVGPU_DBG_GPU_IOCTL_TIMEOUT_ENABLE;
+	else
+		args->enable = NVGPU_DBG_GPU_IOCTL_TIMEOUT_DISABLE;
+}
+
 long gk20a_dbg_gpu_dev_ioctl(struct file *filp, unsigned int cmd,
 			     unsigned long arg)
 {
@@ -531,6 +547,11 @@ long gk20a_dbg_gpu_dev_ioctl(struct file *filp, unsigned int cmd,
 			   (struct nvgpu_dbg_gpu_timeout_args *)buf);
 		break;
 
+	case NVGPU_DBG_GPU_IOCTL_GET_TIMEOUT:
+		nvgpu_dbg_gpu_ioctl_get_timeout(dbg_s,
+			   (struct nvgpu_dbg_gpu_timeout_args *)buf);
+		break;
+
 	default:
 		gk20a_err(dev_from_gk20a(g),
 			   "unrecognized dbg gpu ioctl cmd: 0x%x",
diff --git a/include/uapi/linux/nvgpu.h b/include/uapi/linux/nvgpu.h
index 6eca445ce..d93f5a27d 100644
--- a/include/uapi/linux/nvgpu.h
+++ b/include/uapi/linux/nvgpu.h
@@ -596,6 +596,9 @@ struct nvgpu_dbg_gpu_timeout_args {
 #define NVGPU_DBG_GPU_IOCTL_TIMEOUT \
 	_IOW(NVGPU_DBG_GPU_IOCTL_MAGIC, 10, struct nvgpu_dbg_gpu_timeout_args)
 
+#define NVGPU_DBG_GPU_IOCTL_GET_TIMEOUT \
+	_IOR(NVGPU_DBG_GPU_IOCTL_MAGIC, 11, struct nvgpu_dbg_gpu_timeout_args)
+
 #define NVGPU_DBG_GPU_IOCTL_LAST		\
 	_IOC_NR(NVGPU_DBG_GPU_IOCTL_TIMEOUT)
 #define NVGPU_DBG_GPU_IOCTL_MAX_ARG_SIZE		\