diff options
author | Richard Zhao <rizhao@nvidia.com> | 2018-08-06 20:06:14 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-09-04 19:16:20 -0400 |
commit | f18f06f1043cd049d76520f2230ec40e3f3c1210 (patch) | |
tree | 032bbaccb81ea362eb46b7fa0076a55c1b963ecf /drivers/gpu/nvgpu/gv11b | |
parent | a6499fb9ceddd9ea52cf7e67789a64131545295c (diff) |
Revert "gpu: nvgpu: gv11b: enable RMW for gpu atomics"
The original change caused cuda atomic perf regression.
Bug 2310618
This reverts commit 10c3d4447d4206302f5d51695bf1f193255dd889.
Change-Id: Iea5391a89fdfadfb9a79cda57e71f1c9e87ca882
Signed-off-by: Richard Zhao <rizhao@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1793880
(cherry picked from commit d0e51ddcb8139de70916335f124a80b8b588308b)
Reviewed-on: https://git-master.nvidia.com/r/1804945
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gv11b')
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/gr_gv11b.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c index aeb49982..0fbba3a0 100644 --- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c | |||
@@ -4404,13 +4404,7 @@ void gr_gv11b_init_gpc_mmu(struct gk20a *g) | |||
4404 | gr_gpcs_pri_mmu_ctrl_mmu_aperture_m() | | 4404 | gr_gpcs_pri_mmu_ctrl_mmu_aperture_m() | |
4405 | gr_gpcs_pri_mmu_ctrl_mmu_vol_m() | | 4405 | gr_gpcs_pri_mmu_ctrl_mmu_vol_m() | |
4406 | gr_gpcs_pri_mmu_ctrl_mmu_disable_m(); | 4406 | gr_gpcs_pri_mmu_ctrl_mmu_disable_m(); |
4407 | |||
4408 | temp = set_field(temp, gr_gpcs_pri_mmu_ctrl_atomic_capability_mode_m(), | ||
4409 | gr_gpcs_pri_mmu_ctrl_atomic_capability_mode_rmw_f()); | ||
4410 | gk20a_writel(g, gr_gpcs_pri_mmu_ctrl_r(), temp); | 4407 | gk20a_writel(g, gr_gpcs_pri_mmu_ctrl_r(), temp); |
4411 | nvgpu_log_info(g, "mmu_ctrl_r = 0x%08x, atomic_capability_mode_rmw", | ||
4412 | temp); | ||
4413 | |||
4414 | gk20a_writel(g, gr_gpcs_pri_mmu_pm_unit_mask_r(), 0); | 4408 | gk20a_writel(g, gr_gpcs_pri_mmu_pm_unit_mask_r(), 0); |
4415 | gk20a_writel(g, gr_gpcs_pri_mmu_pm_req_mask_r(), 0); | 4409 | gk20a_writel(g, gr_gpcs_pri_mmu_pm_req_mask_r(), 0); |
4416 | 4410 | ||