diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.c | 10 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 7 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/hal.c | 16 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/platform_gk20a.h | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/pmu_gk20a.c | 12 |
5 files changed, 20 insertions, 26 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c index e2795fbf..3504a32f 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c | |||
@@ -65,10 +65,6 @@ | |||
65 | #define CREATE_TRACE_POINTS | 65 | #define CREATE_TRACE_POINTS |
66 | #include <trace/events/gk20a.h> | 66 | #include <trace/events/gk20a.h> |
67 | 67 | ||
68 | #ifdef CONFIG_ARCH_TEGRA_18x_SOC | ||
69 | #include "nvgpu_gpuid_t18x.h" | ||
70 | #endif | ||
71 | |||
72 | #ifdef CONFIG_TEGRA_19x_GPU | 68 | #ifdef CONFIG_TEGRA_19x_GPU |
73 | #include "nvgpu_gpuid_t19x.h" | 69 | #include "nvgpu_gpuid_t19x.h" |
74 | #endif | 70 | #endif |
@@ -1133,8 +1129,8 @@ static struct of_device_id tegra_gk20a_of_match[] = { | |||
1133 | { .compatible = "nvidia,tegra210-gm20b", | 1129 | { .compatible = "nvidia,tegra210-gm20b", |
1134 | .data = &gm20b_tegra_platform }, | 1130 | .data = &gm20b_tegra_platform }, |
1135 | #ifdef CONFIG_ARCH_TEGRA_18x_SOC | 1131 | #ifdef CONFIG_ARCH_TEGRA_18x_SOC |
1136 | { .compatible = TEGRA_18x_GPU_COMPAT_TEGRA, | 1132 | { .compatible = "nvidia,tegra186-gp10b", |
1137 | .data = &t18x_gpu_tegra_platform }, | 1133 | .data = &gp10b_tegra_platform }, |
1138 | #endif | 1134 | #endif |
1139 | #ifdef CONFIG_TEGRA_19x_GPU | 1135 | #ifdef CONFIG_TEGRA_19x_GPU |
1140 | { .compatible = TEGRA_19x_GPU_COMPAT_TEGRA, | 1136 | { .compatible = TEGRA_19x_GPU_COMPAT_TEGRA, |
@@ -1160,7 +1156,7 @@ static struct of_device_id tegra_gk20a_of_match[] = { | |||
1160 | { .compatible = "nvidia,generic-gm20b", | 1156 | { .compatible = "nvidia,generic-gm20b", |
1161 | .data = &gk20a_generic_platform }, | 1157 | .data = &gk20a_generic_platform }, |
1162 | #ifdef CONFIG_ARCH_TEGRA_18x_SOC | 1158 | #ifdef CONFIG_ARCH_TEGRA_18x_SOC |
1163 | { .compatible = TEGRA_18x_GPU_COMPAT_GENERIC, | 1159 | { .compatible = "nvidia,generic-gp10b", |
1164 | .data = &gk20a_generic_platform }, | 1160 | .data = &gk20a_generic_platform }, |
1165 | #endif | 1161 | #endif |
1166 | { }, | 1162 | { }, |
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index c79cc6c8..8006a4fe 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -1363,9 +1363,14 @@ int gk20a_wait_for_idle(struct device *dev); | |||
1363 | 1363 | ||
1364 | #define GK20A_GPUID_GK20A \ | 1364 | #define GK20A_GPUID_GK20A \ |
1365 | GK20A_GPUID(NVGPU_GPU_ARCH_GK100, NVGPU_GPU_IMPL_GK20A) | 1365 | GK20A_GPUID(NVGPU_GPU_ARCH_GK100, NVGPU_GPU_IMPL_GK20A) |
1366 | |||
1367 | #define GK20A_GPUID_GM20B \ | 1366 | #define GK20A_GPUID_GM20B \ |
1368 | GK20A_GPUID(NVGPU_GPU_ARCH_GM200, NVGPU_GPU_IMPL_GM20B) | 1367 | GK20A_GPUID(NVGPU_GPU_ARCH_GM200, NVGPU_GPU_IMPL_GM20B) |
1368 | #define NVGPU_GPUID_GP10B \ | ||
1369 | GK20A_GPUID(NVGPU_GPU_ARCH_GP100, NVGPU_GPU_IMPL_GP10B) | ||
1370 | #define NVGPU_GPUID_GP104 \ | ||
1371 | GK20A_GPUID(NVGPU_GPU_ARCH_GP100, NVGPU_GPU_IMPL_GP104) | ||
1372 | #define NVGPU_GPUID_GP106 \ | ||
1373 | GK20A_GPUID(NVGPU_GPU_ARCH_GP100, NVGPU_GPU_IMPL_GP106) | ||
1369 | 1374 | ||
1370 | int gk20a_init_gpu_characteristics(struct gk20a *g); | 1375 | int gk20a_init_gpu_characteristics(struct gk20a *g); |
1371 | 1376 | ||
diff --git a/drivers/gpu/nvgpu/gk20a/hal.c b/drivers/gpu/nvgpu/gk20a/hal.c index d4bd0ddc..dc4fcf1c 100644 --- a/drivers/gpu/nvgpu/gk20a/hal.c +++ b/drivers/gpu/nvgpu/gk20a/hal.c | |||
@@ -16,10 +16,8 @@ | |||
16 | #include "gk20a.h" | 16 | #include "gk20a.h" |
17 | #include "hal_gk20a.h" | 17 | #include "hal_gk20a.h" |
18 | #include "gm20b/hal_gm20b.h" | 18 | #include "gm20b/hal_gm20b.h" |
19 | 19 | #include "gp10b/hal_gp10b.h" | |
20 | #ifdef CONFIG_ARCH_TEGRA_18x_SOC | 20 | #include "gp106/hal_gp106.h" |
21 | #include "nvgpu_gpuid_t18x.h" | ||
22 | #endif | ||
23 | 21 | ||
24 | #ifdef CONFIG_TEGRA_19x_GPU | 22 | #ifdef CONFIG_TEGRA_19x_GPU |
25 | #include "nvgpu_gpuid_t19x.h" | 23 | #include "nvgpu_gpuid_t19x.h" |
@@ -39,13 +37,13 @@ int gpu_init_hal(struct gk20a *g) | |||
39 | return -ENODEV; | 37 | return -ENODEV; |
40 | break; | 38 | break; |
41 | #if defined(CONFIG_ARCH_TEGRA_18x_SOC) | 39 | #if defined(CONFIG_ARCH_TEGRA_18x_SOC) |
42 | case TEGRA_18x_GPUID: | 40 | case NVGPU_GPUID_GP10B: |
43 | if (TEGRA_18x_GPUID_HAL(g)) | 41 | if (gp10b_init_hal(g)) |
44 | return -ENODEV; | 42 | return -ENODEV; |
45 | break; | 43 | break; |
46 | case TEGRA_18x_GPUID2: | 44 | case NVGPU_GPUID_GP104: |
47 | case TEGRA_18x_GPUID3: | 45 | case NVGPU_GPUID_GP106: |
48 | if (TEGRA_18x_GPUID2_HAL(g)) | 46 | if (gp106_init_hal(g)) |
49 | return -ENODEV; | 47 | return -ENODEV; |
50 | break; | 48 | break; |
51 | #endif | 49 | #endif |
diff --git a/drivers/gpu/nvgpu/gk20a/platform_gk20a.h b/drivers/gpu/nvgpu/gk20a/platform_gk20a.h index c841c8e6..42be2271 100644 --- a/drivers/gpu/nvgpu/gk20a/platform_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/platform_gk20a.h | |||
@@ -274,6 +274,7 @@ extern struct gk20a_platform gk20a_generic_platform; | |||
274 | #ifdef CONFIG_TEGRA_GK20A | 274 | #ifdef CONFIG_TEGRA_GK20A |
275 | extern struct gk20a_platform gk20a_tegra_platform; | 275 | extern struct gk20a_platform gk20a_tegra_platform; |
276 | extern struct gk20a_platform gm20b_tegra_platform; | 276 | extern struct gk20a_platform gm20b_tegra_platform; |
277 | extern struct gk20a_platform gp10b_tegra_platform; | ||
277 | #ifdef CONFIG_TEGRA_GR_VIRTUALIZATION | 278 | #ifdef CONFIG_TEGRA_GR_VIRTUALIZATION |
278 | extern struct gk20a_platform vgpu_tegra_platform; | 279 | extern struct gk20a_platform vgpu_tegra_platform; |
279 | #endif | 280 | #endif |
diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c index a5664a0e..1322460c 100644 --- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c | |||
@@ -34,10 +34,6 @@ | |||
34 | #include <nvgpu/hw/gk20a/hw_pwr_gk20a.h> | 34 | #include <nvgpu/hw/gk20a/hw_pwr_gk20a.h> |
35 | #include <nvgpu/hw/gk20a/hw_top_gk20a.h> | 35 | #include <nvgpu/hw/gk20a/hw_top_gk20a.h> |
36 | 36 | ||
37 | #ifdef CONFIG_ARCH_TEGRA_18x_SOC | ||
38 | #include "nvgpu_gpuid_t18x.h" | ||
39 | #endif | ||
40 | |||
41 | #ifdef CONFIG_TEGRA_19x_GPU | 37 | #ifdef CONFIG_TEGRA_19x_GPU |
42 | #include "nvgpu_gpuid_t19x.h" | 38 | #include "nvgpu_gpuid_t19x.h" |
43 | #endif | 39 | #endif |
@@ -3707,13 +3703,11 @@ static u8 get_perfmon_id(struct pmu_gk20a *pmu) | |||
3707 | case GK20A_GPUID_GM20B: | 3703 | case GK20A_GPUID_GM20B: |
3708 | unit_id = PMU_UNIT_PERFMON; | 3704 | unit_id = PMU_UNIT_PERFMON; |
3709 | break; | 3705 | break; |
3710 | #if defined(CONFIG_ARCH_TEGRA_18x_SOC) | 3706 | case NVGPU_GPUID_GP10B: |
3711 | case TEGRA_18x_GPUID: | 3707 | case NVGPU_GPUID_GP104: |
3712 | case TEGRA_18x_GPUID2: | 3708 | case NVGPU_GPUID_GP106: |
3713 | case TEGRA_18x_GPUID3: | ||
3714 | unit_id = PMU_UNIT_PERFMON_T18X; | 3709 | unit_id = PMU_UNIT_PERFMON_T18X; |
3715 | break; | 3710 | break; |
3716 | #endif | ||
3717 | #if defined(CONFIG_TEGRA_19x_GPU) | 3711 | #if defined(CONFIG_TEGRA_19x_GPU) |
3718 | case TEGRA_19x_GPUID: | 3712 | case TEGRA_19x_GPUID: |
3719 | unit_id = PMU_UNIT_PERFMON_T18X; | 3713 | unit_id = PMU_UNIT_PERFMON_T18X; |