diff options
Diffstat (limited to 'drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c b/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c index 866ac39e..ebbe7dda 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c +++ b/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2011-2017, NVIDIA Corporation. All rights reserved. | 2 | * Copyright (c) 2011-2018, NVIDIA Corporation. All rights reserved. |
3 | * | 3 | * |
4 | * This program is free software; you can redistribute it and/or modify it | 4 | * This program is free software; you can redistribute it and/or modify it |
5 | * under the terms and conditions of the GNU General Public License, | 5 | * under the terms and conditions of the GNU General Public License, |
@@ -35,9 +35,6 @@ | |||
35 | #include "ioctl_ctrl.h" | 35 | #include "ioctl_ctrl.h" |
36 | #include "ioctl_dbg.h" | 36 | #include "ioctl_dbg.h" |
37 | #include "ioctl_as.h" | 37 | #include "ioctl_as.h" |
38 | #ifdef CONFIG_TEGRA_19x_GPU | ||
39 | #include "common/linux/ioctl_ctrl_t19x.h" | ||
40 | #endif | ||
41 | #include "ioctl_tsg.h" | 38 | #include "ioctl_tsg.h" |
42 | #include "ioctl_channel.h" | 39 | #include "ioctl_channel.h" |
43 | #include "gk20a/gk20a.h" | 40 | #include "gk20a/gk20a.h" |
@@ -173,6 +170,8 @@ static struct nvgpu_flags_mapping flags_mapping[] = { | |||
173 | NVGPU_ECC_ENABLED_TEX}, | 170 | NVGPU_ECC_ENABLED_TEX}, |
174 | {NVGPU_GPU_FLAGS_ECC_ENABLED_LTC, | 171 | {NVGPU_GPU_FLAGS_ECC_ENABLED_LTC, |
175 | NVGPU_ECC_ENABLED_LTC}, | 172 | NVGPU_ECC_ENABLED_LTC}, |
173 | {NVGPU_GPU_FLAGS_SUPPORT_TSG_SUBCONTEXTS, | ||
174 | NVGPU_SUPPORT_TSG_SUBCONTEXTS}, | ||
176 | }; | 175 | }; |
177 | 176 | ||
178 | static u64 nvgpu_ctrl_ioctl_gpu_characteristics_flags(struct gk20a *g) | 177 | static u64 nvgpu_ctrl_ioctl_gpu_characteristics_flags(struct gk20a *g) |
@@ -240,9 +239,7 @@ gk20a_ctrl_ioctl_gpu_characteristics( | |||
240 | gpu.gpc_mask = (1 << g->gr.gpc_count)-1; | 239 | gpu.gpc_mask = (1 << g->gr.gpc_count)-1; |
241 | 240 | ||
242 | gpu.flags = nvgpu_ctrl_ioctl_gpu_characteristics_flags(g); | 241 | gpu.flags = nvgpu_ctrl_ioctl_gpu_characteristics_flags(g); |
243 | #ifdef CONFIG_TEGRA_19x_GPU | 242 | |
244 | gpu.flags |= nvgpu_ctrl_ioctl_gpu_characteristics_flags_t19x(g); | ||
245 | #endif | ||
246 | gpu.arch = g->params.gpu_arch; | 243 | gpu.arch = g->params.gpu_arch; |
247 | gpu.impl = g->params.gpu_impl; | 244 | gpu.impl = g->params.gpu_impl; |
248 | gpu.rev = g->params.gpu_rev; | 245 | gpu.rev = g->params.gpu_rev; |