From a26de1185a9cc894d37ea826f67ba4f34a646fb3 Mon Sep 17 00:00:00 2001 From: Srikar Srimath Tirumala Date: Mon, 26 Feb 2018 15:29:36 -0800 Subject: Revert "gpu: nvgpu: Use gv11b_css_hw_set_handled_snapshots for GV11B" This reverts commit 2f2e51bbae39009d0305f6aaf01596571a8f5d5c. Bug 2068936 Change-Id: I539cdc12a3bd0d9d7fe0ce7dbe9cb7a274eeaa57 Signed-off-by: Srikar Srimath Tirumala Reviewed-on: https://git-master.nvidia.com/r/1664647 Reviewed-by: Alex Waterman Reviewed-by: svc-mobile-coverity GVS: Gerrit_Virtual_Submit --- drivers/gpu/nvgpu/gv11b/css_gr_gv11b.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'drivers/gpu/nvgpu/gv11b/css_gr_gv11b.c') diff --git a/drivers/gpu/nvgpu/gv11b/css_gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/css_gr_gv11b.c index d8ba332b..617ea61d 100644 --- a/drivers/gpu/nvgpu/gv11b/css_gr_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/css_gr_gv11b.c @@ -57,6 +57,15 @@ static inline u32 css_hw_get_pending_snapshots(struct gk20a *g) sizeof(struct gk20a_cs_snapshot_fifo_entry); } +/* informs hw how many snapshots have been processed (frees up fifo space) */ +static inline void gv11b_css_hw_set_handled_snapshots(struct gk20a *g, u32 done) +{ + if (done > 0) { + gk20a_writel(g, perf_pmasys_mem_bump_r(), + done * sizeof(struct gk20a_cs_snapshot_fifo_entry)); + } +} + /* disable streaming to memory */ static void gv11b_css_hw_reset_streaming(struct gk20a *g) { @@ -77,17 +86,6 @@ static void gv11b_css_hw_reset_streaming(struct gk20a *g) gv11b_css_hw_set_handled_snapshots(g, css_hw_get_pending_snapshots(g)); } -/* informs hw how many snapshots have been processed (frees up fifo space) */ -void gv11b_css_hw_set_handled_snapshots(struct gk20a *g, u32 done) -{ - if (done == 0u) { - return; - } - - gk20a_writel(g, perf_pmasys_mem_bump_r(), - done * sizeof(struct gk20a_cs_snapshot_fifo_entry)); -} - int gv11b_css_hw_enable_snapshot(struct channel_gk20a *ch, struct gk20a_cs_snapshot_client *cs_client) { -- cgit v1.2.2