diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2017-12-17 16:25:33 -0500 |
---|---|---|
committer | Alex Waterman <alexw@nvidia.com> | 2017-12-17 19:21:52 -0500 |
commit | b014a0b2c18cf8661ef5f45502add906c75ca0ce (patch) | |
tree | 996c8a27ac0465a7c7b376e08400e2cebb98b806 /drivers/gpu/nvgpu/gv11b/ltc_gv11b.c | |
parent | 65513bc33d65c921cd556a72e4e9263565dca4bf (diff) |
gpu: nvgpu: gv11b: Skip disabling vdc_4to2
gr_gv11b_init_fs_state() calls gr_gm20b_init_fs_state() which
disables vdc_4to2. This should no longer be done on gv11b, so
instead of calling gr_gm20b_init_fs_state() copy the relevant
lines to gr_gv11b_init_fs_state() and drop vdc_4to2 disable.
gv11b_ltc_init_fs_state() also disables it to match the state.
Remove that disable, too.
Change-Id: I3a3fd87a3e8836e495cb818570c971b3d29a6dd1
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1619966
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Seema Khowala <seemaj@nvidia.com>
GVS: Gerrit_Virtual_Submit
Tested-by: Wei Sun <wsun@nvidia.com>
Reviewed-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gv11b/ltc_gv11b.c')
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/ltc_gv11b.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c b/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c index a199e024..8661b420 100644 --- a/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c | |||
@@ -69,10 +69,6 @@ void gv11b_ltc_init_fs_state(struct gk20a *g) | |||
69 | g->ltc_count = gk20a_readl(g, pri_ringmaster_enum_ltc_r()); | 69 | g->ltc_count = gk20a_readl(g, pri_ringmaster_enum_ltc_r()); |
70 | gk20a_dbg_info("%u ltcs out of %u", g->ltc_count, g->max_ltc_count); | 70 | gk20a_dbg_info("%u ltcs out of %u", g->ltc_count, g->max_ltc_count); |
71 | 71 | ||
72 | gk20a_writel(g, ltc_ltcs_ltss_dstg_cfg0_r(), | ||
73 | gk20a_readl(g, ltc_ltc0_lts0_dstg_cfg0_r()) | | ||
74 | ltc_ltcs_ltss_dstg_cfg0_vdc_4to2_disable_m()); | ||
75 | |||
76 | /* Disable LTC interrupts */ | 72 | /* Disable LTC interrupts */ |
77 | reg = gk20a_readl(g, ltc_ltcs_ltss_intr_r()); | 73 | reg = gk20a_readl(g, ltc_ltcs_ltss_intr_r()); |
78 | reg &= ~ltc_ltcs_ltss_intr_en_evicted_cb_m(); | 74 | reg &= ~ltc_ltcs_ltss_intr_en_evicted_cb_m(); |