From b80ccedce01c63239aa1b9a67a56dbad6a3b4367 Mon Sep 17 00:00:00 2001 From: Deepak Nibade Date: Thu, 19 Apr 2018 02:52:25 -0700 Subject: gpu: nvgpu: support upcoming GPU In gpu_init_hal(), call NVGPU_NEXT_INIT_HAL() to initialize HAL of upcoming GPU All upcoming GPU related support is compiled only if CONFIG_TEGRA_GPU_NEXT is set Jira NVGPUT-42 Change-Id: I1563acd60f20fda50f4557a068398c1d5d224f3e Signed-off-by: Deepak Nibade Reviewed-on: https://git-master.nvidia.com/r/1699312 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: svc-mobile-coverity GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/Makefile | 1 + drivers/gpu/nvgpu/gk20a/hal.c | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index 53de45b9..c51a0948 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile @@ -4,6 +4,7 @@ ccflags-y += -I$(srctree.nvgpu)/drivers/gpu/nvgpu/include ccflags-y += -I$(srctree.nvgpu)/drivers/gpu/nvgpu ccflags-y += -I$(srctree.nvgpu)/include ccflags-y += -I$(srctree.nvgpu)/include/uapi +ccflags-y += -I$(srctree.nvgpu-next)/drivers/gpu/nvgpu ccflags-y += -I$(srctree)/drivers/devfreq diff --git a/drivers/gpu/nvgpu/gk20a/hal.c b/drivers/gpu/nvgpu/gk20a/hal.c index ec6816c6..939567e7 100644 --- a/drivers/gpu/nvgpu/gk20a/hal.c +++ b/drivers/gpu/nvgpu/gk20a/hal.c @@ -29,6 +29,9 @@ #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 @@ -59,6 +62,12 @@ int gpu_init_hal(struct gk20a *g) if (gv100_init_hal(g)) return -ENODEV; break; +#if defined(CONFIG_TEGRA_GPU_NEXT) + case NVGPU_GPUID_NEXT: + if (NVGPU_NEXT_INIT_HAL(g)) + return -ENODEV; + break; +#endif default: nvgpu_err(g, "no support for %x", ver); -- cgit v1.2.2