From bbebc611bc10a824d5d51fc2ea9d0408e350d26a Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Fri, 6 Jul 2018 08:50:36 -0700 Subject: gpu: nvgpu: Do not enable replayable fault for context Do not allow enabling replayable page faults in instace block. JIRA NVGPU-714 Change-Id: I9c48497e31798ab354a86d460a299e65774b388a Signed-off-by: Terje Bergstrom Reviewed-on: https://git-master.nvidia.com/r/1772863 Reviewed-by: svc-mobile-coverity Reviewed-by: svccoveritychecker Reviewed-by: svc-misra-checker GVS: Gerrit_Virtual_Submit Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gp10b/fifo_gp10b.c | 27 --------------------------- 1 file changed, 27 deletions(-) (limited to 'drivers/gpu/nvgpu/gp10b') diff --git a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c index fd4ec34e..64bf4647 100644 --- a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c @@ -38,30 +38,6 @@ #include #include -static void gp10b_set_pdb_fault_replay_flags(struct gk20a *g, - struct nvgpu_mem *mem) -{ - u32 val; - - nvgpu_log_fn(g, " "); - - val = nvgpu_mem_rd32(g, mem, - ram_in_page_dir_base_fault_replay_tex_w()); - val &= ~ram_in_page_dir_base_fault_replay_tex_m(); - val |= ram_in_page_dir_base_fault_replay_tex_true_f(); - nvgpu_mem_wr32(g, mem, - ram_in_page_dir_base_fault_replay_tex_w(), val); - - val = nvgpu_mem_rd32(g, mem, - ram_in_page_dir_base_fault_replay_gcc_w()); - val &= ~ram_in_page_dir_base_fault_replay_gcc_m(); - val |= ram_in_page_dir_base_fault_replay_gcc_true_f(); - nvgpu_mem_wr32(g, mem, - ram_in_page_dir_base_fault_replay_gcc_w(), val); - - nvgpu_log_fn(g, "done"); -} - int channel_gp10b_commit_userd(struct channel_gk20a *c) { u32 addr_lo; @@ -141,9 +117,6 @@ int channel_gp10b_setup_ramfc(struct channel_gk20a *c, pbdma_runlist_timeslice_timescale_3_f() | pbdma_runlist_timeslice_enable_true_f()); - if (flags & NVGPU_GPFIFO_FLAGS_REPLAYABLE_FAULTS_ENABLE) - gp10b_set_pdb_fault_replay_flags(c->g, mem); - nvgpu_mem_wr32(g, mem, ram_fc_chid_w(), ram_fc_chid_id_f(c->chid)); if (c->is_privileged_channel) { -- cgit v1.2.2