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 /drivers/gpu/nvgpu/gk20a | |
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>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/hal.c | 1 |
2 files changed, 3 insertions, 0 deletions
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; |