summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/nvgpu/common/pmu/pmu_perfmon.c1
-rw-r--r--drivers/gpu/nvgpu/gk20a/gk20a.h2
-rw-r--r--drivers/gpu/nvgpu/gk20a/hal.c1
-rw-r--r--drivers/gpu/nvgpu/vgpu/vgpu.c1
4 files changed, 5 insertions, 0 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;