From 76b78b6fdcb0bbed72645aaa85de6013e2b135c3 Mon Sep 17 00:00:00 2001 From: Alex Waterman Date: Tue, 7 Feb 2017 16:29:51 -0800 Subject: gpu: nvgpu: Remove nvgpu_gpuid_t18x.h Remove nvgpu_gpuid_t18x.h since this file is now visible. Migrate the relevant definitions and defines into their expected places and make the code use the real defines. No longer is hiding t18x specific stuff necessary. Bug 1799159 Change-Id: I47fa2392e46fdb7aacc70aeb0cc8c3f5ca0dc22f Signed-off-by: Alex Waterman Reviewed-on: http://git-master/r/1300976 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/hal.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/hal.c') diff --git a/drivers/gpu/nvgpu/gk20a/hal.c b/drivers/gpu/nvgpu/gk20a/hal.c index d4bd0ddc..dc4fcf1c 100644 --- a/drivers/gpu/nvgpu/gk20a/hal.c +++ b/drivers/gpu/nvgpu/gk20a/hal.c @@ -16,10 +16,8 @@ #include "gk20a.h" #include "hal_gk20a.h" #include "gm20b/hal_gm20b.h" - -#ifdef CONFIG_ARCH_TEGRA_18x_SOC -#include "nvgpu_gpuid_t18x.h" -#endif +#include "gp10b/hal_gp10b.h" +#include "gp106/hal_gp106.h" #ifdef CONFIG_TEGRA_19x_GPU #include "nvgpu_gpuid_t19x.h" @@ -39,13 +37,13 @@ int gpu_init_hal(struct gk20a *g) return -ENODEV; break; #if defined(CONFIG_ARCH_TEGRA_18x_SOC) - case TEGRA_18x_GPUID: - if (TEGRA_18x_GPUID_HAL(g)) + case NVGPU_GPUID_GP10B: + if (gp10b_init_hal(g)) return -ENODEV; break; - case TEGRA_18x_GPUID2: - case TEGRA_18x_GPUID3: - if (TEGRA_18x_GPUID2_HAL(g)) + case NVGPU_GPUID_GP104: + case NVGPU_GPUID_GP106: + if (gp106_init_hal(g)) return -ENODEV; break; #endif -- cgit v1.2.2