diff options
author | Deepak Nibade <dnibade@nvidia.com> | 2018-04-19 05:52:25 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-04-22 10:33:35 -0400 |
commit | b80ccedce01c63239aa1b9a67a56dbad6a3b4367 (patch) | |
tree | 75a2e19089b4f35784089fc74f28183a1423bd0e /drivers/gpu/nvgpu/gk20a | |
parent | a7a256d7c408fe77208518704b0eca1e2e1aa483 (diff) |
gpu: nvgpu: support upcoming GPU
In gpu_init_hal(), call NVGPU_NEXT_INIT_HAL() to initialize HAL of upcoming
GPU
All upcoming GPU related support is compiled only if CONFIG_TEGRA_GPU_NEXT
is set
Jira NVGPUT-42
Change-Id: I1563acd60f20fda50f4557a068398c1d5d224f3e
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1699312
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/hal.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/hal.c b/drivers/gpu/nvgpu/gk20a/hal.c index ec6816c6..939567e7 100644 --- a/drivers/gpu/nvgpu/gk20a/hal.c +++ b/drivers/gpu/nvgpu/gk20a/hal.c | |||
@@ -29,6 +29,9 @@ | |||
29 | #include "gp106/hal_gp106.h" | 29 | #include "gp106/hal_gp106.h" |
30 | #include "gv100/hal_gv100.h" | 30 | #include "gv100/hal_gv100.h" |
31 | #include "gv11b/hal_gv11b.h" | 31 | #include "gv11b/hal_gv11b.h" |
32 | #if defined(CONFIG_TEGRA_GPU_NEXT) | ||
33 | #include "nvgpu_gpuid_next.h" | ||
34 | #endif | ||
32 | 35 | ||
33 | #include <nvgpu/log.h> | 36 | #include <nvgpu/log.h> |
34 | 37 | ||
@@ -59,6 +62,12 @@ int gpu_init_hal(struct gk20a *g) | |||
59 | if (gv100_init_hal(g)) | 62 | if (gv100_init_hal(g)) |
60 | return -ENODEV; | 63 | return -ENODEV; |
61 | break; | 64 | break; |
65 | #if defined(CONFIG_TEGRA_GPU_NEXT) | ||
66 | case NVGPU_GPUID_NEXT: | ||
67 | if (NVGPU_NEXT_INIT_HAL(g)) | ||
68 | return -ENODEV; | ||
69 | break; | ||
70 | #endif | ||
62 | 71 | ||
63 | default: | 72 | default: |
64 | nvgpu_err(g, "no support for %x", ver); | 73 | nvgpu_err(g, "no support for %x", ver); |