summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c2
-rw-r--r--drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c1
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/enabled.h2
-rw-r--r--include/uapi/linux/nvgpu.h2
4 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c b/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c
index f5f467b3..0b449692 100644
--- a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c
+++ b/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c
@@ -176,6 +176,8 @@ static struct nvgpu_flags_mapping flags_mapping[] = {
176 NVGPU_SUPPORT_TSG_SUBCONTEXTS}, 176 NVGPU_SUPPORT_TSG_SUBCONTEXTS},
177 {NVGPU_GPU_FLAGS_SUPPORT_SCG, 177 {NVGPU_GPU_FLAGS_SUPPORT_SCG,
178 NVGPU_SUPPORT_SCG}, 178 NVGPU_SUPPORT_SCG},
179 {NVGPU_GPU_FLAGS_SUPPORT_VPR,
180 NVGPU_SUPPORT_VPR},
179}; 181};
180 182
181static u64 nvgpu_ctrl_ioctl_gpu_characteristics_flags(struct gk20a *g) 183static u64 nvgpu_ctrl_ioctl_gpu_characteristics_flags(struct gk20a *g)
diff --git a/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c b/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c
index db30fff2..127a8ce9 100644
--- a/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c
+++ b/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c
@@ -667,6 +667,7 @@ void gk20a_tegra_idle(struct device *dev)
667void gk20a_tegra_init_secure_alloc(struct gk20a *g) 667void gk20a_tegra_init_secure_alloc(struct gk20a *g)
668{ 668{
669 g->ops.secure_alloc = gk20a_tegra_secure_alloc; 669 g->ops.secure_alloc = gk20a_tegra_secure_alloc;
670 __nvgpu_set_enabled(g, NVGPU_SUPPORT_VPR, true);
670} 671}
671 672
672#ifdef CONFIG_COMMON_CLK 673#ifdef CONFIG_COMMON_CLK
diff --git a/drivers/gpu/nvgpu/include/nvgpu/enabled.h b/drivers/gpu/nvgpu/include/nvgpu/enabled.h
index cdfd0c55..e6f9525d 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/enabled.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/enabled.h
@@ -113,6 +113,8 @@ struct gk20a;
113 113
114#define NVGPU_SEC_SECUREGPCCS 41 114#define NVGPU_SEC_SECUREGPCCS 41
115#define NVGPU_SEC_PRIVSECURITY 42 115#define NVGPU_SEC_PRIVSECURITY 42
116/* VPR is supported */
117#define NVGPU_SUPPORT_VPR 43
116 118
117/* 119/*
118 * Nvlink flags 120 * Nvlink flags
diff --git a/include/uapi/linux/nvgpu.h b/include/uapi/linux/nvgpu.h
index 41b4eb8d..206832ae 100644
--- a/include/uapi/linux/nvgpu.h
+++ b/include/uapi/linux/nvgpu.h
@@ -156,6 +156,8 @@ struct nvgpu_gpu_zbc_query_table_args {
156#define NVGPU_GPU_FLAGS_SUPPORT_SCG (1ULL << 25) 156#define NVGPU_GPU_FLAGS_SUPPORT_SCG (1ULL << 25)
157/* GPU_VA address of a syncpoint is supported */ 157/* GPU_VA address of a syncpoint is supported */
158#define NVGPU_GPU_FLAGS_SUPPORT_SYNCPOINT_ADDRESS (1ULL << 26) 158#define NVGPU_GPU_FLAGS_SUPPORT_SYNCPOINT_ADDRESS (1ULL << 26)
159/* VPR is supported */
160#define NVGPU_GPU_FLAGS_SUPPORT_VPR (1ULL << 27)
159/* SM LRF ECC is enabled */ 161/* SM LRF ECC is enabled */
160#define NVGPU_GPU_FLAGS_ECC_ENABLED_SM_LRF (1ULL << 60) 162#define NVGPU_GPU_FLAGS_ECC_ENABLED_SM_LRF (1ULL << 60)
161/* SM SHM ECC is enabled */ 163/* SM SHM ECC is enabled */