summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2016-05-11 14:16:53 -0400
committerKen Adams <kadams@nvidia.com>2016-05-13 10:21:22 -0400
commit67535de642c485eae0f9529ae8148c9ea071b9c1 (patch)
treecf212af741597436481d3eebcbf2a4bcddbf3f19 /drivers/gpu/nvgpu
parent6eebc87d99f9f04b2b68e0bc0142c161ab3e669d (diff)
gpu: nvgpu: Do not enable L2 bit CYA15
Enabling L2 CYA15 is necessary only in another GPU for enabling an HW fix. gk20a does not have this problem, so enabling CYA15 is not necessary. Change-Id: I7318e8541ad392f9a34f3650beac05a39d7bba68 Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: http://git-master/r/1146086 Reviewed-by: Ken Adams <kadams@nvidia.com> Tested-by: Ken Adams <kadams@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r--drivers/gpu/nvgpu/gk20a/gr_gk20a.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index e7e6662a..4638d597 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -1294,7 +1294,6 @@ static int gr_gk20a_ctx_state_floorsweep(struct gk20a *g)
1294 u32 sm_id = 0, gpc_id = 0; 1294 u32 sm_id = 0, gpc_id = 0;
1295 u32 tpc_per_gpc; 1295 u32 tpc_per_gpc;
1296 u32 max_ways_evict = INVALID_MAX_WAYS; 1296 u32 max_ways_evict = INVALID_MAX_WAYS;
1297 u32 l1c_dbg_reg_val;
1298 u32 gpc_stride = nvgpu_get_litter_value(g, GPU_LIT_GPC_STRIDE); 1297 u32 gpc_stride = nvgpu_get_litter_value(g, GPU_LIT_GPC_STRIDE);
1299 u32 tpc_in_gpc_stride = nvgpu_get_litter_value(g, GPU_LIT_TPC_IN_GPC_STRIDE); 1298 u32 tpc_in_gpc_stride = nvgpu_get_litter_value(g, GPU_LIT_TPC_IN_GPC_STRIDE);
1300 1299
@@ -1382,11 +1381,6 @@ static int gr_gk20a_ctx_state_floorsweep(struct gk20a *g)
1382 gk20a_writel(g, gr_bes_crop_settings_r(), 1381 gk20a_writel(g, gr_bes_crop_settings_r(),
1383 gr_bes_crop_settings_num_active_fbps_f(gr->num_fbps)); 1382 gr_bes_crop_settings_num_active_fbps_f(gr->num_fbps));
1384 1383
1385 /* turn on cya15 bit for a default val that missed the cut */
1386 l1c_dbg_reg_val = gk20a_readl(g, gr_gpc0_tpc0_l1c_dbg_r());
1387 l1c_dbg_reg_val |= gr_gpc0_tpc0_l1c_dbg_cya15_en_f();
1388 gk20a_writel(g, gr_gpc0_tpc0_l1c_dbg_r(), l1c_dbg_reg_val);
1389
1390 return 0; 1384 return 0;
1391} 1385}
1392 1386