diff options
author | Seshendra Gadagottu <sgadagottu@nvidia.com> | 2016-05-27 15:22:25 -0400 |
---|---|---|
committer | Seshendra Gadagottu <sgadagottu@nvidia.com> | 2016-06-02 01:28:53 -0400 |
commit | 6af864087c3060c73fda346b88c0ee7d4ee19a10 (patch) | |
tree | ec7b57267b5c07ce405bf0d727254f1a08af8eeb /drivers/gpu | |
parent | 6fb4193559a371c6131005c71cdc5060c1d9e667 (diff) |
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 <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>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.c | 4 | ||||
-rw-r--r-- | 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 @@ | |||
71 | #include "nvgpu_gpuid_t18x.h" | 71 | #include "nvgpu_gpuid_t18x.h" |
72 | #endif | 72 | #endif |
73 | 73 | ||
74 | #ifdef CONFIG_ARCH_TEGRA_19x_SOC | 74 | #ifdef CONFIG_TEGRA_19x_GPU |
75 | #include "nvgpu_gpuid_t19x.h" | 75 | #include "nvgpu_gpuid_t19x.h" |
76 | #endif | 76 | #endif |
77 | 77 | ||
@@ -933,7 +933,7 @@ static struct of_device_id tegra_gk20a_of_match[] = { | |||
933 | { .compatible = TEGRA_18x_GPU_COMPAT_TEGRA, | 933 | { .compatible = TEGRA_18x_GPU_COMPAT_TEGRA, |
934 | .data = &t18x_gpu_tegra_platform }, | 934 | .data = &t18x_gpu_tegra_platform }, |
935 | #endif | 935 | #endif |
936 | #ifdef CONFIG_ARCH_TEGRA_19x_SOC | 936 | #ifdef CONFIG_TEGRA_19x_GPU |
937 | { .compatible = TEGRA_19x_GPU_COMPAT_TEGRA, | 937 | { .compatible = TEGRA_19x_GPU_COMPAT_TEGRA, |
938 | .data = &t19x_gpu_tegra_platform }, | 938 | .data = &t19x_gpu_tegra_platform }, |
939 | #endif | 939 | #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 @@ | |||
22 | #include "nvgpu_gpuid_t18x.h" | 22 | #include "nvgpu_gpuid_t18x.h" |
23 | #endif | 23 | #endif |
24 | 24 | ||
25 | #ifdef CONFIG_ARCH_TEGRA_19x_SOC | 25 | #ifdef CONFIG_TEGRA_19x_GPU |
26 | #include "nvgpu_gpuid_t19x.h" | 26 | #include "nvgpu_gpuid_t19x.h" |
27 | #endif | 27 | #endif |
28 | 28 | ||
@@ -55,7 +55,7 @@ int gpu_init_hal(struct gk20a *g) | |||
55 | return -ENODEV; | 55 | return -ENODEV; |
56 | break; | 56 | break; |
57 | #endif | 57 | #endif |
58 | #if defined(CONFIG_ARCH_TEGRA_19x_SOC) | 58 | #ifdef CONFIG_TEGRA_19x_GPU |
59 | case TEGRA_19x_GPUID: | 59 | case TEGRA_19x_GPUID: |
60 | if (TEGRA_19x_GPUID_HAL(g)) | 60 | if (TEGRA_19x_GPUID_HAL(g)) |
61 | return -ENODEV; | 61 | return -ENODEV; |