summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Daifuku <pdaifuku@nvidia.com>2017-08-04 13:44:41 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-08-07 02:14:13 -0400
commit026d1f8efec6f88a6a910820b761ba1b335edc72 (patch)
tree685aeca163093262786976f0de510f4f9a25497c
parent5a5792d911d99a08663c59f74c552883804780f3 (diff)
gpu: nvgpu: update gv11b_get_litter_value
Update gv11b_get_litter_value: - add PPC_IN_GPC_BASE - set all FBPA values to 0, since gv11b does not have an FBPA unit - error/bug if we fall through to default, for easier debugging JIRA EVLR-1712 Change-Id: I9a388d6f525e101d4742ade07f972410ec3b2591 Signed-off-by: Peter Daifuku <pdaifuku@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1533192 Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com>
-rw-r--r--drivers/gpu/nvgpu/gv11b/hal_gv11b.c21
1 files changed, 15 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
index 12ec4841..282aa228 100644
--- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
@@ -105,6 +105,9 @@ static int gv11b_get_litter_value(struct gk20a *g, int value)
105 case GPU_LIT_TPC_IN_GPC_SHARED_BASE: 105 case GPU_LIT_TPC_IN_GPC_SHARED_BASE:
106 ret = proj_tpc_in_gpc_shared_base_v(); 106 ret = proj_tpc_in_gpc_shared_base_v();
107 break; 107 break;
108 case GPU_LIT_PPC_IN_GPC_BASE:
109 ret = proj_ppc_in_gpc_base_v();
110 break;
108 case GPU_LIT_PPC_IN_GPC_STRIDE: 111 case GPU_LIT_PPC_IN_GPC_STRIDE:
109 ret = proj_ppc_in_gpc_stride_v(); 112 ret = proj_ppc_in_gpc_stride_v();
110 break; 113 break;
@@ -129,17 +132,23 @@ static int gv11b_get_litter_value(struct gk20a *g, int value)
129 case GPU_LIT_LTS_STRIDE: 132 case GPU_LIT_LTS_STRIDE:
130 ret = proj_lts_stride_v(); 133 ret = proj_lts_stride_v();
131 break; 134 break;
132 case GPU_LIT_NUM_FBPAS:
133 ret = proj_scal_litter_num_fbpas_v();
134 break;
135 case GPU_LIT_FBPA_STRIDE:
136 ret = proj_fbpa_stride_v();
137 break;
138 case GPU_LIT_SM_PRI_STRIDE: 135 case GPU_LIT_SM_PRI_STRIDE:
139 ret = proj_sm_stride_v(); 136 ret = proj_sm_stride_v();
140 break; 137 break;
138 /* GV11B does not have a FBPA unit, despite what's listed in the
139 * hw headers or read back through NV_PTOP_SCAL_NUM_FBPAS,
140 * so hardcode all values to 0.
141 */
142 case GPU_LIT_NUM_FBPAS:
143 case GPU_LIT_FBPA_STRIDE:
144 case GPU_LIT_FBPA_BASE:
145 case GPU_LIT_FBPA_SHARED_BASE:
146 ret = 0;
147 break;
141 148
142 default: 149 default:
150 nvgpu_err(g, "Missing definition %d", value);
151 BUG();
143 break; 152 break;
144 } 153 }
145 154