From 6af864087c3060c73fda346b88c0ee7d4ee19a10 Mon Sep 17 00:00:00 2001 From: Seshendra Gadagottu Date: Fri, 27 May 2016 12:22:25 -0700 Subject: gpu: nvgpu: add t19x functionality conditionally Include t19x functionality only when config TEGRA_T19x_GPU is enabled. Bug 1757988 Change-Id: I049f134d92c4ffdeeed2bc513579f7d9d396ff41 Signed-off-by: Seshendra Gadagottu Reviewed-on: http://git-master/r/1155297 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/gk20a/gk20a.c | 4 ++-- drivers/gpu/nvgpu/gk20a/hal.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c index 2e40a675..a3bbe034 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c @@ -71,7 +71,7 @@ #include "nvgpu_gpuid_t18x.h" #endif -#ifdef CONFIG_ARCH_TEGRA_19x_SOC +#ifdef CONFIG_TEGRA_19x_GPU #include "nvgpu_gpuid_t19x.h" #endif @@ -933,7 +933,7 @@ static struct of_device_id tegra_gk20a_of_match[] = { { .compatible = TEGRA_18x_GPU_COMPAT_TEGRA, .data = &t18x_gpu_tegra_platform }, #endif -#ifdef CONFIG_ARCH_TEGRA_19x_SOC +#ifdef CONFIG_TEGRA_19x_GPU { .compatible = TEGRA_19x_GPU_COMPAT_TEGRA, .data = &t19x_gpu_tegra_platform }, #endif diff --git a/drivers/gpu/nvgpu/gk20a/hal.c b/drivers/gpu/nvgpu/gk20a/hal.c index 52ec108b..7ab4153b 100644 --- a/drivers/gpu/nvgpu/gk20a/hal.c +++ b/drivers/gpu/nvgpu/gk20a/hal.c @@ -22,7 +22,7 @@ #include "nvgpu_gpuid_t18x.h" #endif -#ifdef CONFIG_ARCH_TEGRA_19x_SOC +#ifdef CONFIG_TEGRA_19x_GPU #include "nvgpu_gpuid_t19x.h" #endif @@ -55,7 +55,7 @@ int gpu_init_hal(struct gk20a *g) return -ENODEV; break; #endif -#if defined(CONFIG_ARCH_TEGRA_19x_SOC) +#ifdef CONFIG_TEGRA_19x_GPU case TEGRA_19x_GPUID: if (TEGRA_19x_GPUID_HAL(g)) return -ENODEV; -- cgit v1.2.2