diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2017-10-27 18:45:23 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-10-29 22:45:46 -0400 |
commit | 8221a19e13eb388b2fca46ac02cf3f1b5b0b8b7a (patch) | |
tree | f70450412e29ce438f8701989f3541af8b2ab39c | |
parent | 721315298b0d02cedfd186ce3b61da1acd4020b8 (diff) |
gpu: nvgpu: Define GPUIDs without referring to UAPI
Define GPUIDs without referring to constants defined in
<linux/uapi/nvgpu.h>.
JIRA NVGPU-259
Change-Id: I87a677cb0d3377b718dc3aa90175db002df59c9d
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1587280
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index 65c3b56f..dca27887 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -1412,18 +1412,12 @@ int gk20a_wait_for_idle(struct gk20a *g); | |||
1412 | * arch/impl fields */ | 1412 | * arch/impl fields */ |
1413 | #define GK20A_GPUID(arch, impl) ((u32) ((arch) | (impl))) | 1413 | #define GK20A_GPUID(arch, impl) ((u32) ((arch) | (impl))) |
1414 | 1414 | ||
1415 | #define GK20A_GPUID_GK20A \ | 1415 | #define GK20A_GPUID_GK20A 0x000000EA |
1416 | GK20A_GPUID(NVGPU_GPU_ARCH_GK100, NVGPU_GPU_IMPL_GK20A) | 1416 | #define GK20A_GPUID_GM20B 0x0000012B |
1417 | #define GK20A_GPUID_GM20B \ | 1417 | #define GK20A_GPUID_GM20B_B 0x0000012E |
1418 | GK20A_GPUID(NVGPU_GPU_ARCH_GM200, NVGPU_GPU_IMPL_GM20B) | 1418 | #define NVGPU_GPUID_GP10B 0x0000013B |
1419 | #define NVGPU_GPUID_GP10B \ | 1419 | #define NVGPU_GPUID_GP104 0x00000134 |
1420 | GK20A_GPUID(NVGPU_GPU_ARCH_GP100, NVGPU_GPU_IMPL_GP10B) | 1420 | #define NVGPU_GPUID_GP106 0x00000136 |
1421 | #define GK20A_GPUID_GM20B_B \ | ||
1422 | GK20A_GPUID(NVGPU_GPU_ARCH_GM200, NVGPU_GPU_IMPL_GM20B_B) | ||
1423 | #define NVGPU_GPUID_GP104 \ | ||
1424 | GK20A_GPUID(NVGPU_GPU_ARCH_GP100, NVGPU_GPU_IMPL_GP104) | ||
1425 | #define NVGPU_GPUID_GP106 \ | ||
1426 | GK20A_GPUID(NVGPU_GPU_ARCH_GP100, NVGPU_GPU_IMPL_GP106) | ||
1427 | 1421 | ||
1428 | int gk20a_init_gpu_characteristics(struct gk20a *g); | 1422 | int gk20a_init_gpu_characteristics(struct gk20a *g); |
1429 | 1423 | ||