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 <alexw@nvidia.com>
Reviewed-on: http://git-master/r/1300976
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

1 files changed, 3 insertions, 8 deletions

diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.c b/drivers/gpu/nvgpu/vgpu/vgpu.c
index c8ab23f1..d8e0dfa1 100644
--- a/drivers/gpu/nvgpu/vgpu/vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/vgpu.c
@@ -31,10 +31,6 @@
 
 #include <nvgpu/hw/gk20a/hw_mc_gk20a.h>
 
-#ifdef CONFIG_ARCH_TEGRA_18x_SOC
-#include "nvgpu_gpuid_t18x.h"
-#endif
-
 static inline int vgpu_comm_init(struct platform_device *pdev)
 {
         size_t queue_sizes[] = { TEGRA_VGPU_QUEUE_SIZES };
@@ -374,11 +370,10 @@ static int vgpu_init_hal(struct gk20a *g)
                 gk20a_dbg_info("gm20b detected");
                 err = vgpu_gm20b_init_hal(g);
                 break;
-#if defined(CONFIG_ARCH_TEGRA_18x_SOC)
-        case TEGRA_18x_GPUID:
-                err = TEGRA_18x_GPUID_VGPU_HAL(g);
+        case NVGPU_GPUID_GP10B:
+                gk20a_dbg_info("gp10b detected");
+                err = vgpu_gp10b_init_hal(g);
                 break;
-#endif
         default:
                 gk20a_err(g->dev, "no support for %x", ver);
                 err = -ENODEV;