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/vgpu/gp10b/vgpu_hal_gp10b.c | 1 - drivers/gpu/nvgpu/vgpu/vgpu.c | 11 +++-------- drivers/gpu/nvgpu/vgpu/vgpu.h | 1 + 3 files changed, 4 insertions(+), 9 deletions(-) (limited to 'drivers/gpu/nvgpu/vgpu') diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c index b665a8dd..14a7768a 100644 --- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c +++ b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c @@ -16,7 +16,6 @@ #include "vgpu_gr_gp10b.h" #include "vgpu_fifo_gp10b.h" #include "vgpu_mm_gp10b.h" -#include "nvgpu_gpuid_t18x.h" int vgpu_gp10b_init_hal(struct gk20a *g) { 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 -#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; diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.h b/drivers/gpu/nvgpu/vgpu/vgpu.h index 098c7dbd..7883abc1 100644 --- a/drivers/gpu/nvgpu/vgpu/vgpu.h +++ b/drivers/gpu/nvgpu/vgpu/vgpu.h @@ -101,6 +101,7 @@ int vgpu_comm_sendrecv(struct tegra_vgpu_cmd_msg *msg, size_t size_in, void vgpu_init_hal_common(struct gk20a *g); int vgpu_gk20a_init_hal(struct gk20a *g); int vgpu_gm20b_init_hal(struct gk20a *g); +int vgpu_gp10b_init_hal(struct gk20a *g); void vgpu_init_dbg_session_ops(struct gpu_ops *gops); -- cgit v1.2.2