nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-22 17:36:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvpgu: Use correct chipid

Browse Source 
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>
This commit is contained in:
Samuel Payne
2017-06-19 21:01:49 -07:00
committed by mobile promotions
parent 94cb4b635f
commit 102c512082
5 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/nvgpu/common/pmu/pmu_perfmon.c
View File

@@ -30,6 +30,7 @@ static u8 get_perfmon_id(struct nvgpu_pmu *pmu)
switch (ver) { switch (ver) {
case GK20A_GPUID_GK20A: case GK20A_GPUID_GK20A:
case GK20A_GPUID_GM20B: case GK20A_GPUID_GM20B:
case GK20A_GPUID_GM20B_B:
unit_id = PMU_UNIT_PERFMON; unit_id = PMU_UNIT_PERFMON;
break; break;
case NVGPU_GPUID_GP10B: case NVGPU_GPUID_GP10B:

2
drivers/gpu/nvgpu/gk20a/gk20a.h
View File

@@ -1448,6 +1448,8 @@ int gk20a_wait_for_idle(struct device *dev);
GK20A_GPUID(NVGPU_GPU_ARCH_GM200, NVGPU_GPU_IMPL_GM20B) GK20A_GPUID(NVGPU_GPU_ARCH_GM200, NVGPU_GPU_IMPL_GM20B)
#define NVGPU_GPUID_GP10B \ #define NVGPU_GPUID_GP10B \
GK20A_GPUID(NVGPU_GPU_ARCH_GP100, NVGPU_GPU_IMPL_GP10B) GK20A_GPUID(NVGPU_GPU_ARCH_GP100, NVGPU_GPU_IMPL_GP10B)
#define GK20A_GPUID_GM20B_B \
GK20A_GPUID(NVGPU_GPU_ARCH_GM200, NVGPU_GPU_IMPL_GM20B_B)
#define NVGPU_GPUID_GP104 \ #define NVGPU_GPUID_GP104 \
GK20A_GPUID(NVGPU_GPU_ARCH_GP100, NVGPU_GPU_IMPL_GP104) GK20A_GPUID(NVGPU_GPU_ARCH_GP100, NVGPU_GPU_IMPL_GP104)
#define NVGPU_GPUID_GP106 \ #define NVGPU_GPUID_GP106 \

1
drivers/gpu/nvgpu/gk20a/hal.c
View File

@@ -35,6 +35,7 @@ int gpu_init_hal(struct gk20a *g)
gk20a_init_hal(g); gk20a_init_hal(g);
break; break;
case GK20A_GPUID_GM20B: case GK20A_GPUID_GM20B:
case GK20A_GPUID_GM20B_B:
gk20a_dbg_info("gm20b detected"); gk20a_dbg_info("gm20b detected");
if (gm20b_init_hal(g)) if (gm20b_init_hal(g))
return -ENODEV; return -ENODEV;

1
drivers/gpu/nvgpu/vgpu/vgpu.c
View File

@@ -445,6 +445,7 @@ static int vgpu_init_hal(struct gk20a *g)
err = vgpu_gk20a_init_hal(g); err = vgpu_gk20a_init_hal(g);
break; break;
case GK20A_GPUID_GM20B: case GK20A_GPUID_GM20B:
case GK20A_GPUID_GM20B_B:
gk20a_dbg_info("gm20b detected"); gk20a_dbg_info("gm20b detected");
err = vgpu_gm20b_init_hal(g); err = vgpu_gm20b_init_hal(g);
break; break;

21
include/uapi/linux/nvgpu.h
View File

@@ -81,17 +81,18 @@ struct nvgpu_gpu_zbc_query_table_args {
/* This contains the minimal set by which the userspace can /* This contains the minimal set by which the userspace can
determine all the properties of the GPU */ determine all the properties of the GPU */
#define NVGPU_GPU_ARCH_GK100 0x000000E0 #define NVGPU_GPU_ARCH_GK100 0x000000E0
#define NVGPU_GPU_ARCH_GM200 0x00000120 #define NVGPU_GPU_ARCH_GM200 0x00000120
#define NVGPU_GPU_ARCH_GP100 0x00000130 #define NVGPU_GPU_ARCH_GP100 0x00000130
#define NVGPU_GPU_IMPL_GK20A 0x0000000A #define NVGPU_GPU_IMPL_GK20A 0x0000000A
#define NVGPU_GPU_IMPL_GM204 0x00000004 #define NVGPU_GPU_IMPL_GM204 0x00000004
#define NVGPU_GPU_IMPL_GM206 0x00000006 #define NVGPU_GPU_IMPL_GM206 0x00000006
#define NVGPU_GPU_IMPL_GM20B 0x0000000B #define NVGPU_GPU_IMPL_GM20B 0x0000000B
#define NVGPU_GPU_IMPL_GP104 0x00000004 #define NVGPU_GPU_IMPL_GM20B_B 0x0000000E
#define NVGPU_GPU_IMPL_GP106 0x00000006 #define NVGPU_GPU_IMPL_GP104 0x00000004
#define NVGPU_GPU_IMPL_GP10B 0x0000000B #define NVGPU_GPU_IMPL_GP106 0x00000006
#define NVGPU_GPU_IMPL_GP10B 0x0000000B
#ifdef CONFIG_ARCH_TEGRA_18x_SOC #ifdef CONFIG_ARCH_TEGRA_18x_SOC
#include <linux/nvgpu-t18x.h> #include <linux/nvgpu-t18x.h>