nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-24 02:22:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: add t19x functionality conditionally

Browse Source 
Include t19x functionality only when config TEGRA_T19x_GPU
is enabled.

Bug 1757988

Change-Id: I049f134d92c4ffdeeed2bc513579f7d9d396ff41
Signed-off-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
Reviewed-on: http://git-master/r/1155297
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
This commit is contained in:
Seshendra Gadagottu
2016-05-27 12:22:25 -07:00
parent 6fb4193559
commit 6af864087c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/nvgpu/gk20a/gk20a.c
View File

@@ -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

4
drivers/gpu/nvgpu/gk20a/hal.c
View File

@@ -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;