gpu: nvgpu: Remove the GPU-NEXT conditional

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

View File

@@ -21,10 +21,7 @@
#include "os_ops_gp106.h"
#include "os_ops_gv11b.h"
#include "os_ops_gv100.h"
#if defined(CONFIG_TEGRA_GPU_NEXT)
#include "nvgpu_gpuid_next.h"
#endif
#include "os_ops_tu104.h"
int nvgpu_init_os_linux_ops(struct nvgpu_os_linux *l)
{
@@ -48,11 +45,9 @@ int nvgpu_init_os_linux_ops(struct nvgpu_os_linux *l)
case NVGPU_GPUID_GV11B:
nvgpu_gv11b_init_os_ops(l);
break;
#if defined(CONFIG_TEGRA_GPU_NEXT)
case NVGPU_GPUID_NEXT:
NVGPU_NEXT_INIT_OS_OPS(l);
case NVGPU_GPUID_TU104:
nvgpu_tu104_init_os_ops(l);
break;
#endif
default:
break;
}