diff options
author | Samuel Payne <spayne@nvidia.com> | 2017-06-20 00:01:49 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-06-23 18:54:12 -0400 |
commit | 102c512082b8810c4b50ab0266748ec6776b76d8 (patch) | |
tree | 5bf58f947f1b188572f889435f9d851db5d250b4 | |
parent | 94cb4b635fba4c01b58f36a6d3384db729e4c9f6 (diff) |
gpu: nvpgu: Use correct chipid
Add gm20b "B" revision chipip.
Bug 1870669
Change-Id: Ife31e6d739aabb8ef4a4f401091c3202b415a70e
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/1490650
Reviewed-by: Samuel Payne <spayne@nvidia.com>
Signed-off-by: Samuel Payne <spayne@nvidia.com>
Reviewed-on: http://git-master/r/1490648
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
-rw-r--r-- | drivers/gpu/nvgpu/common/pmu/pmu_perfmon.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/hal.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/vgpu.c | 1 | ||||
-rw-r--r-- | include/uapi/linux/nvgpu.h | 23 |
5 files changed, 17 insertions, 11 deletions
diff --git a/drivers/gpu/nvgpu/common/pmu/pmu_perfmon.c b/drivers/gpu/nvgpu/common/pmu/pmu_perfmon.c index e28e53a0..9f236aa8 100644 --- a/drivers/gpu/nvgpu/common/pmu/pmu_perfmon.c +++ b/drivers/gpu/nvgpu/common/pmu/pmu_perfmon.c | |||
@@ -30,6 +30,7 @@ static u8 get_perfmon_id(struct nvgpu_pmu *pmu) | |||
30 | switch (ver) { | 30 | switch (ver) { |
31 | case GK20A_GPUID_GK20A: | 31 | case GK20A_GPUID_GK20A: |
32 | case GK20A_GPUID_GM20B: | 32 | case GK20A_GPUID_GM20B: |
33 | case GK20A_GPUID_GM20B_B: | ||
33 | unit_id = PMU_UNIT_PERFMON; | 34 | unit_id = PMU_UNIT_PERFMON; |
34 | break; | 35 | break; |
35 | case NVGPU_GPUID_GP10B: | 36 | case NVGPU_GPUID_GP10B: |
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index 64716ac4..ffce1c5e 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -1448,6 +1448,8 @@ int gk20a_wait_for_idle(struct device *dev); | |||
1448 | GK20A_GPUID(NVGPU_GPU_ARCH_GM200, NVGPU_GPU_IMPL_GM20B) | 1448 | GK20A_GPUID(NVGPU_GPU_ARCH_GM200, NVGPU_GPU_IMPL_GM20B) |
1449 | #define NVGPU_GPUID_GP10B \ | 1449 | #define NVGPU_GPUID_GP10B \ |
1450 | GK20A_GPUID(NVGPU_GPU_ARCH_GP100, NVGPU_GPU_IMPL_GP10B) | 1450 | GK20A_GPUID(NVGPU_GPU_ARCH_GP100, NVGPU_GPU_IMPL_GP10B) |
1451 | #define GK20A_GPUID_GM20B_B \ | ||
1452 | GK20A_GPUID(NVGPU_GPU_ARCH_GM200, NVGPU_GPU_IMPL_GM20B_B) | ||
1451 | #define NVGPU_GPUID_GP104 \ | 1453 | #define NVGPU_GPUID_GP104 \ |
1452 | GK20A_GPUID(NVGPU_GPU_ARCH_GP100, NVGPU_GPU_IMPL_GP104) | 1454 | GK20A_GPUID(NVGPU_GPU_ARCH_GP100, NVGPU_GPU_IMPL_GP104) |
1453 | #define NVGPU_GPUID_GP106 \ | 1455 | #define NVGPU_GPUID_GP106 \ |
diff --git a/drivers/gpu/nvgpu/gk20a/hal.c b/drivers/gpu/nvgpu/gk20a/hal.c index ce99aa7a..8fadc199 100644 --- a/drivers/gpu/nvgpu/gk20a/hal.c +++ b/drivers/gpu/nvgpu/gk20a/hal.c | |||
@@ -35,6 +35,7 @@ int gpu_init_hal(struct gk20a *g) | |||
35 | gk20a_init_hal(g); | 35 | gk20a_init_hal(g); |
36 | break; | 36 | break; |
37 | case GK20A_GPUID_GM20B: | 37 | case GK20A_GPUID_GM20B: |
38 | case GK20A_GPUID_GM20B_B: | ||
38 | gk20a_dbg_info("gm20b detected"); | 39 | gk20a_dbg_info("gm20b detected"); |
39 | if (gm20b_init_hal(g)) | 40 | if (gm20b_init_hal(g)) |
40 | return -ENODEV; | 41 | return -ENODEV; |
diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.c b/drivers/gpu/nvgpu/vgpu/vgpu.c index 559ba4ea..1a6dbb35 100644 --- a/drivers/gpu/nvgpu/vgpu/vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/vgpu.c | |||
@@ -445,6 +445,7 @@ static int vgpu_init_hal(struct gk20a *g) | |||
445 | err = vgpu_gk20a_init_hal(g); | 445 | err = vgpu_gk20a_init_hal(g); |
446 | break; | 446 | break; |
447 | case GK20A_GPUID_GM20B: | 447 | case GK20A_GPUID_GM20B: |
448 | case GK20A_GPUID_GM20B_B: | ||
448 | gk20a_dbg_info("gm20b detected"); | 449 | gk20a_dbg_info("gm20b detected"); |
449 | err = vgpu_gm20b_init_hal(g); | 450 | err = vgpu_gm20b_init_hal(g); |
450 | break; | 451 | break; |
diff --git a/include/uapi/linux/nvgpu.h b/include/uapi/linux/nvgpu.h index 065aaece..8b29a3ae 100644 --- a/include/uapi/linux/nvgpu.h +++ b/include/uapi/linux/nvgpu.h | |||
@@ -81,17 +81,18 @@ struct nvgpu_gpu_zbc_query_table_args { | |||
81 | 81 | ||
82 | /* This contains the minimal set by which the userspace can | 82 | /* This contains the minimal set by which the userspace can |
83 | determine all the properties of the GPU */ | 83 | determine all the properties of the GPU */ |
84 | #define NVGPU_GPU_ARCH_GK100 0x000000E0 | 84 | #define NVGPU_GPU_ARCH_GK100 0x000000E0 |
85 | #define NVGPU_GPU_ARCH_GM200 0x00000120 | 85 | #define NVGPU_GPU_ARCH_GM200 0x00000120 |
86 | #define NVGPU_GPU_ARCH_GP100 0x00000130 | 86 | #define NVGPU_GPU_ARCH_GP100 0x00000130 |
87 | 87 | ||
88 | #define NVGPU_GPU_IMPL_GK20A 0x0000000A | 88 | #define NVGPU_GPU_IMPL_GK20A 0x0000000A |
89 | #define NVGPU_GPU_IMPL_GM204 0x00000004 | 89 | #define NVGPU_GPU_IMPL_GM204 0x00000004 |
90 | #define NVGPU_GPU_IMPL_GM206 0x00000006 | 90 | #define NVGPU_GPU_IMPL_GM206 0x00000006 |
91 | #define NVGPU_GPU_IMPL_GM20B 0x0000000B | 91 | #define NVGPU_GPU_IMPL_GM20B 0x0000000B |
92 | #define NVGPU_GPU_IMPL_GP104 0x00000004 | 92 | #define NVGPU_GPU_IMPL_GM20B_B 0x0000000E |
93 | #define NVGPU_GPU_IMPL_GP106 0x00000006 | 93 | #define NVGPU_GPU_IMPL_GP104 0x00000004 |
94 | #define NVGPU_GPU_IMPL_GP10B 0x0000000B | 94 | #define NVGPU_GPU_IMPL_GP106 0x00000006 |
95 | #define NVGPU_GPU_IMPL_GP10B 0x0000000B | ||
95 | 96 | ||
96 | #ifdef CONFIG_ARCH_TEGRA_18x_SOC | 97 | #ifdef CONFIG_ARCH_TEGRA_18x_SOC |
97 | #include <linux/nvgpu-t18x.h> | 98 | #include <linux/nvgpu-t18x.h> |