nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-24 02:22:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: Remove the GPU-NEXT conditional

Browse Source 
Remove build conditional for GPU-NEXT. It was used for including
code for tu104, but now it's part of main nvgpu. Leave a TURING
conditional to not need Turing code in other builds.

JIRA NVGPU-961

Change-Id: I74177863c451d78b6db6165249561f15eadc3cc3
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1936803
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Terje Bergstrom
2018-10-26 13:54:56 -07:00
committed by mobile promotions
parent 63da5366a6
commit 7525c1337b
11 changed files with 55 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/nvgpu/common/init/hal_init.c
View File

@@ -33,9 +33,7 @@
#include "gp106/hal_gp106.h"
#include "gv100/hal_gv100.h"
#include "gv11b/hal_gv11b.h"
#if defined(CONFIG_TEGRA_GPU_NEXT)
#include "nvgpu_gpuid_next.h"
#endif
#include "tu104/hal_tu104.h"
int nvgpu_init_hal(struct gk20a *g)
{
@@ -80,9 +78,9 @@ int nvgpu_init_hal(struct gk20a *g)
return -ENODEV;
}
break;
#if defined(CONFIG_TEGRA_GPU_NEXT)
case NVGPU_GPUID_NEXT:
if (NVGPU_NEXT_INIT_HAL(g) != 0) {
#if defined(CONFIG_NVGPU_SUPPORT_TURING)
case NVGPU_GPUID_TU104:
if (tu104_init_hal(g) != 0) {
return -ENODEV;
}
break;