diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2016-03-23 11:41:04 -0400 |
---|---|---|
committer | Deepak Nibade <dnibade@nvidia.com> | 2016-12-27 04:56:16 -0500 |
commit | 3d0f9a751784ac9eb27f9f989f3b584ff5dc8f17 (patch) | |
tree | 4c1df46e81b17f47ddc8731beb95c7f351de7788 /drivers/gpu/nvgpu/nvgpu_gpuid_t18x.h | |
parent | 21eda905ea69a0e090f6e29c444a9129c65f0b1f (diff) |
gpu: nvgpu: Add support for gp104 and gp106
Add support for chips gp104 and gp106.
Change-Id: Ied5f239bdd0ec85245bce1fb6ef51330871d0f05
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1120465
GVS: Gerrit_Virtual_Submit
Reviewed-by: Ken Adams <kadams@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/nvgpu_gpuid_t18x.h')
-rw-r--r-- | drivers/gpu/nvgpu/nvgpu_gpuid_t18x.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/nvgpu_gpuid_t18x.h b/drivers/gpu/nvgpu/nvgpu_gpuid_t18x.h index 96f02125..84da4b96 100644 --- a/drivers/gpu/nvgpu/nvgpu_gpuid_t18x.h +++ b/drivers/gpu/nvgpu/nvgpu_gpuid_t18x.h | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * NVIDIA GPU ID functions, definitions. | 2 | * NVIDIA GPU ID functions, definitions. |
3 | * | 3 | * |
4 | * Copyright (c) 2014-2015, NVIDIA CORPORATION. All rights reserved. | 4 | * Copyright (c) 2014-2016, NVIDIA CORPORATION. All rights reserved. |
5 | * | 5 | * |
6 | * This program is free software; you can redistribute it and/or modify it | 6 | * This program is free software; you can redistribute it and/or modify it |
7 | * under the terms and conditions of the GNU General Public License, | 7 | * under the terms and conditions of the GNU General Public License, |
@@ -17,6 +17,10 @@ | |||
17 | 17 | ||
18 | #define NVGPU_GPUID_GP10B \ | 18 | #define NVGPU_GPUID_GP10B \ |
19 | GK20A_GPUID(NVGPU_GPU_ARCH_GP100, NVGPU_GPU_IMPL_GP10B) | 19 | GK20A_GPUID(NVGPU_GPU_ARCH_GP100, NVGPU_GPU_IMPL_GP10B) |
20 | #define NVGPU_GPUID_GP104 \ | ||
21 | GK20A_GPUID(NVGPU_GPU_ARCH_GP100, NVGPU_GPU_IMPL_GP104) | ||
22 | #define NVGPU_GPUID_GP106 \ | ||
23 | GK20A_GPUID(NVGPU_GPU_ARCH_GP100, NVGPU_GPU_IMPL_GP106) | ||
20 | 24 | ||
21 | #define NVGPU_COMPAT_TEGRA_GP10B "nvidia,tegra186-gp10b" | 25 | #define NVGPU_COMPAT_TEGRA_GP10B "nvidia,tegra186-gp10b" |
22 | #define NVGPU_COMPAT_GENERIC_GP10B "nvidia,generic-gp10b" | 26 | #define NVGPU_COMPAT_GENERIC_GP10B "nvidia,generic-gp10b" |
@@ -25,8 +29,13 @@ | |||
25 | #define TEGRA_18x_GPUID_HAL gp10b_init_hal | 29 | #define TEGRA_18x_GPUID_HAL gp10b_init_hal |
26 | #define TEGRA_18x_GPU_COMPAT_TEGRA NVGPU_COMPAT_TEGRA_GP10B | 30 | #define TEGRA_18x_GPU_COMPAT_TEGRA NVGPU_COMPAT_TEGRA_GP10B |
27 | #define TEGRA_18x_GPU_COMPAT_GENERIC NVGPU_COMPAT_GENERIC_GP10B | 31 | #define TEGRA_18x_GPU_COMPAT_GENERIC NVGPU_COMPAT_GENERIC_GP10B |
32 | #define TEGRA_18x_GPUID2 NVGPU_GPUID_GP104 | ||
33 | #define TEGRA_18x_GPUID2_HAL gp106_init_hal | ||
34 | #define TEGRA_18x_GPUID3 NVGPU_GPUID_GP106 | ||
35 | #define TEGRA_18x_GPUID3_HAL gp106_init_hal | ||
28 | struct gpu_ops; | 36 | struct gpu_ops; |
29 | extern int gp10b_init_hal(struct gk20a *); | 37 | extern int gp10b_init_hal(struct gk20a *); |
38 | extern int gp106_init_hal(struct gk20a *); | ||
30 | extern struct gk20a_platform t18x_gpu_tegra_platform; | 39 | extern struct gk20a_platform t18x_gpu_tegra_platform; |
31 | 40 | ||
32 | #ifdef CONFIG_TEGRA_GR_VIRTUALIZATION | 41 | #ifdef CONFIG_TEGRA_GR_VIRTUALIZATION |