diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/hal_gk20a.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/hal_gm20b.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp106/hal_gp106.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/hal_gp10b.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_proj_gm20b.h | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_proj_gp106.h | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_proj_gp10b.h | 6 |
7 files changed, 27 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/hal_gk20a.c b/drivers/gpu/nvgpu/gk20a/hal_gk20a.c index 27ddbca1..5408c822 100644 --- a/drivers/gpu/nvgpu/gk20a/hal_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/hal_gk20a.c | |||
@@ -89,6 +89,9 @@ static int gk20a_get_litter_value(struct gk20a *g, int value) | |||
89 | case GPU_LIT_NUM_TPC_PER_GPC: | 89 | case GPU_LIT_NUM_TPC_PER_GPC: |
90 | ret = proj_scal_litter_num_tpc_per_gpc_v(); | 90 | ret = proj_scal_litter_num_tpc_per_gpc_v(); |
91 | break; | 91 | break; |
92 | case GPU_LIT_NUM_SM_PER_TPC: | ||
93 | ret = 1; | ||
94 | break; | ||
92 | case GPU_LIT_NUM_FBPS: | 95 | case GPU_LIT_NUM_FBPS: |
93 | ret = proj_scal_litter_num_fbps_v(); | 96 | ret = proj_scal_litter_num_fbps_v(); |
94 | break; | 97 | break; |
diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c index 53542702..d22caab8 100644 --- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c | |||
@@ -128,6 +128,9 @@ static int gm20b_get_litter_value(struct gk20a *g, int value) | |||
128 | case GPU_LIT_NUM_TPC_PER_GPC: | 128 | case GPU_LIT_NUM_TPC_PER_GPC: |
129 | ret = proj_scal_litter_num_tpc_per_gpc_v(); | 129 | ret = proj_scal_litter_num_tpc_per_gpc_v(); |
130 | break; | 130 | break; |
131 | case GPU_LIT_NUM_SM_PER_TPC: | ||
132 | ret = proj_scal_litter_num_sm_per_tpc_v(); | ||
133 | break; | ||
131 | case GPU_LIT_NUM_FBPS: | 134 | case GPU_LIT_NUM_FBPS: |
132 | ret = proj_scal_litter_num_fbps_v(); | 135 | ret = proj_scal_litter_num_fbps_v(); |
133 | break; | 136 | break; |
diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c index adea3eb8..3f0a9a98 100644 --- a/drivers/gpu/nvgpu/gp106/hal_gp106.c +++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c | |||
@@ -134,6 +134,9 @@ static int gp106_get_litter_value(struct gk20a *g, int value) | |||
134 | case GPU_LIT_NUM_PES_PER_GPC: | 134 | case GPU_LIT_NUM_PES_PER_GPC: |
135 | ret = proj_scal_litter_num_pes_per_gpc_v(); | 135 | ret = proj_scal_litter_num_pes_per_gpc_v(); |
136 | break; | 136 | break; |
137 | case GPU_LIT_NUM_SM_PER_TPC: | ||
138 | ret = proj_scal_litter_num_sm_per_tpc_v(); | ||
139 | break; | ||
137 | case GPU_LIT_NUM_ZCULL_BANKS: | 140 | case GPU_LIT_NUM_ZCULL_BANKS: |
138 | ret = proj_scal_litter_num_zcull_banks_v(); | 141 | ret = proj_scal_litter_num_zcull_banks_v(); |
139 | break; | 142 | break; |
diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c index bf7a039c..505dc6d7 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c | |||
@@ -136,6 +136,9 @@ static int gp10b_get_litter_value(struct gk20a *g, int value) | |||
136 | case GPU_LIT_NUM_TPC_PER_GPC: | 136 | case GPU_LIT_NUM_TPC_PER_GPC: |
137 | ret = proj_scal_litter_num_tpc_per_gpc_v(); | 137 | ret = proj_scal_litter_num_tpc_per_gpc_v(); |
138 | break; | 138 | break; |
139 | case GPU_LIT_NUM_SM_PER_TPC: | ||
140 | ret = proj_scal_litter_num_sm_per_tpc_v(); | ||
141 | break; | ||
139 | case GPU_LIT_NUM_FBPS: | 142 | case GPU_LIT_NUM_FBPS: |
140 | ret = proj_scal_litter_num_fbps_v(); | 143 | ret = proj_scal_litter_num_fbps_v(); |
141 | break; | 144 | break; |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_proj_gm20b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_proj_gm20b.h index 026c7848..eeab2a9a 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_proj_gm20b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_proj_gm20b.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2014-2016, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2014-2017, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * This program is free software; you can redistribute it and/or modify it | 4 | * This program is free software; you can redistribute it and/or modify it |
5 | * under the terms and conditions of the GNU General Public License, | 5 | * under the terms and conditions of the GNU General Public License, |
@@ -122,6 +122,10 @@ static inline u32 proj_scal_litter_num_tpc_per_gpc_v(void) | |||
122 | { | 122 | { |
123 | return 0x00000002; | 123 | return 0x00000002; |
124 | } | 124 | } |
125 | static inline u32 proj_scal_litter_num_sm_per_tpc_v(void) | ||
126 | { | ||
127 | return 0x00000001; | ||
128 | } | ||
125 | static inline u32 proj_scal_litter_num_fbps_v(void) | 129 | static inline u32 proj_scal_litter_num_fbps_v(void) |
126 | { | 130 | { |
127 | return 0x00000001; | 131 | return 0x00000001; |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_proj_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_proj_gp106.h index 8042bcae..dc56d7c9 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_proj_gp106.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_proj_gp106.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * This program is free software; you can redistribute it and/or modify it | 4 | * This program is free software; you can redistribute it and/or modify it |
5 | * under the terms and conditions of the GNU General Public License, | 5 | * under the terms and conditions of the GNU General Public License, |
@@ -130,6 +130,10 @@ static inline u32 proj_scal_litter_num_tpc_per_gpc_v(void) | |||
130 | { | 130 | { |
131 | return 0x00000005; | 131 | return 0x00000005; |
132 | } | 132 | } |
133 | static inline u32 proj_scal_litter_num_sm_per_tpc_v(void) | ||
134 | { | ||
135 | return 0x00000001; | ||
136 | } | ||
133 | static inline u32 proj_scal_litter_num_fbps_v(void) | 137 | static inline u32 proj_scal_litter_num_fbps_v(void) |
134 | { | 138 | { |
135 | return 0x00000006; | 139 | return 0x00000006; |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_proj_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_proj_gp10b.h index 3392242c..4f398b69 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_proj_gp10b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_proj_gp10b.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2014-2016, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * This program is free software; you can redistribute it and/or modify it | 4 | * This program is free software; you can redistribute it and/or modify it |
5 | * under the terms and conditions of the GNU General Public License, | 5 | * under the terms and conditions of the GNU General Public License, |
@@ -130,6 +130,10 @@ static inline u32 proj_scal_litter_num_tpc_per_gpc_v(void) | |||
130 | { | 130 | { |
131 | return 0x00000002; | 131 | return 0x00000002; |
132 | } | 132 | } |
133 | static inline u32 proj_scal_litter_num_sm_per_tpc_v(void) | ||
134 | { | ||
135 | return 0x00000001; | ||
136 | } | ||
133 | static inline u32 proj_scal_litter_num_fbps_v(void) | 137 | static inline u32 proj_scal_litter_num_fbps_v(void) |
134 | { | 138 | { |
135 | return 0x00000001; | 139 | return 0x00000001; |