summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c
diff options
context:
space:
mode:
authorseshendra Gadagottu <sgadagottu@nvidia.com>2017-05-17 23:03:22 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-06-07 16:35:28 -0400
commit3bf38954c2cd794485ed1bac50df8e61ad1100eb (patch)
treedb7b2b7e181a72974c2e2e62d69b1bdd11c15aa9 /drivers/gpu/nvgpu/gv11b/ltc_gv11b.c
parent3e22195974ef233e12f69c5769d42b322f5adc1e (diff)
gpu: nvgpu: gv11b: move cbc init to mmu from ltc
Added cbc_init in fb and removed cbc_init from ltc. Also avoid writing into read only registers in ltc. GPUT19X-70 GPUT19X-116 Change-Id: Ife53e8ec7f049d666baacea3b7c45179e3e13ff9 Signed-off-by: seshendra Gadagottu <sgadagottu@nvidia.com> Reviewed-on: http://git-master/r/1484525 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gv11b/ltc_gv11b.c')
-rw-r--r--drivers/gpu/nvgpu/gv11b/ltc_gv11b.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c b/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c
index b8a97ce3..5b98b0aa 100644
--- a/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c
@@ -53,10 +53,6 @@ static void gv11b_ltc_init_fs_state(struct gk20a *g)
53 g->ltc_count = gk20a_readl(g, pri_ringmaster_enum_ltc_r()); 53 g->ltc_count = gk20a_readl(g, pri_ringmaster_enum_ltc_r());
54 gk20a_dbg_info("%u ltcs out of %u", g->ltc_count, g->max_ltc_count); 54 gk20a_dbg_info("%u ltcs out of %u", g->ltc_count, g->max_ltc_count);
55 55
56 reg = gk20a_readl(g, ltc_ltcs_ltss_cbc_num_active_ltcs_r());
57 reg |= ltc_ltcs_ltss_cbc_num_active_ltcs_serialize_f(true);
58 gk20a_writel(g, ltc_ltcs_ltss_cbc_num_active_ltcs_r(), reg);
59
60 gk20a_writel(g, ltc_ltcs_ltss_dstg_cfg0_r(), 56 gk20a_writel(g, ltc_ltcs_ltss_dstg_cfg0_r(),
61 gk20a_readl(g, ltc_ltc0_lts0_dstg_cfg0_r()) | 57 gk20a_readl(g, ltc_ltc0_lts0_dstg_cfg0_r()) |
62 ltc_ltcs_ltss_dstg_cfg0_vdc_4to2_disable_m()); 58 ltc_ltcs_ltss_dstg_cfg0_vdc_4to2_disable_m());
@@ -200,4 +196,5 @@ void gv11b_init_ltc(struct gpu_ops *gops)
200 gops->ltc.init_fs_state = gv11b_ltc_init_fs_state; 196 gops->ltc.init_fs_state = gv11b_ltc_init_fs_state;
201 gops->ltc.cbc_fix_config = gv11b_ltc_cbc_fix_config; 197 gops->ltc.cbc_fix_config = gv11b_ltc_cbc_fix_config;
202 gops->ltc.isr = gv11b_ltc_isr; 198 gops->ltc.isr = gv11b_ltc_isr;
199 gops->ltc.init_cbc = NULL;
203} 200}