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/gk20a/css_gr_gk20a.c | 4 ++-- drivers/gpu/nvgpu/gk20a/css_gr_gk20a.h | 2 +- drivers/gpu/nvgpu/gm20b/hal_gm20b.c | 2 +- drivers/gpu/nvgpu/gp106/hal_gp106.c | 2 +- drivers/gpu/nvgpu/gp10b/hal_gp10b.c | 2 +- drivers/gpu/nvgpu/gv100/hal_gv100.c | 2 +- drivers/gpu/nvgpu/gv11b/css_gr_gv11b.c | 20 +++++++++----------- drivers/gpu/nvgpu/gv11b/css_gr_gv11b.h | 1 - drivers/gpu/nvgpu/gv11b/hal_gv11b.c | 2 +- 9 files changed, 17 insertions(+), 20 deletions(-) (limited to 'drivers') diff --git a/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c index 60ba875f..114386a2 100644 --- a/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c @@ -75,7 +75,7 @@ static inline u32 css_hw_get_pending_snapshots(struct gk20a *g) } /* informs hw how many snapshots have been processed (frees up fifo space) */ -void gk20a_css_hw_set_handled_snapshots(struct gk20a *g, u32 done) +void css_hw_set_handled_snapshots(struct gk20a *g, u32 done) { if (done > 0) { gk20a_writel(g, perf_pmasys_mem_bump_r(), @@ -102,7 +102,7 @@ static void css_hw_reset_streaming(struct gk20a *g) perf_pmasys_control_membuf_clear_status_doit_f()); /* pointing all pending snapshots as handled */ - gk20a_css_hw_set_handled_snapshots(g, css_hw_get_pending_snapshots(g)); + css_hw_set_handled_snapshots(g, css_hw_get_pending_snapshots(g)); } /* diff --git a/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.h index 12e1903a..bee8f4fb 100644 --- a/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.h @@ -129,7 +129,7 @@ struct gk20a_cs_snapshot { struct gk20a_cs_snapshot_fifo_entry *hw_get; }; -void gk20a_css_hw_set_handled_snapshots(struct gk20a *g, u32 done); +void css_hw_set_handled_snapshots(struct gk20a *g, u32 done); int css_hw_enable_snapshot(struct channel_gk20a *ch, struct gk20a_cs_snapshot_client *cs_client); void css_hw_disable_snapshot(struct gr_gk20a *gr); diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c index a2541460..b3efdc8a 100644 --- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c @@ -577,7 +577,7 @@ static const struct gpu_ops gm20b_ops = { .enable_snapshot = css_hw_enable_snapshot, .disable_snapshot = css_hw_disable_snapshot, .check_data_available = css_hw_check_data_available, - .set_handled_snapshots = gk20a_css_hw_set_handled_snapshots, + .set_handled_snapshots = css_hw_set_handled_snapshots, .allocate_perfmon_ids = css_gr_allocate_perfmon_ids, .release_perfmon_ids = css_gr_release_perfmon_ids, }, diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c index f98f2772..502a6778 100644 --- a/drivers/gpu/nvgpu/gp106/hal_gp106.c +++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c @@ -689,7 +689,7 @@ static const struct gpu_ops gp106_ops = { .enable_snapshot = css_hw_enable_snapshot, .disable_snapshot = css_hw_disable_snapshot, .check_data_available = css_hw_check_data_available, - .set_handled_snapshots = gk20a_css_hw_set_handled_snapshots, + .set_handled_snapshots = css_hw_set_handled_snapshots, .allocate_perfmon_ids = css_gr_allocate_perfmon_ids, .release_perfmon_ids = css_gr_release_perfmon_ids, }, diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c index bbb43cc8..91ebab55 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c @@ -623,7 +623,7 @@ static const struct gpu_ops gp10b_ops = { .enable_snapshot = css_hw_enable_snapshot, .disable_snapshot = css_hw_disable_snapshot, .check_data_available = css_hw_check_data_available, - .set_handled_snapshots = gk20a_css_hw_set_handled_snapshots, + .set_handled_snapshots = css_hw_set_handled_snapshots, .allocate_perfmon_ids = css_gr_allocate_perfmon_ids, .release_perfmon_ids = css_gr_release_perfmon_ids, }, diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c index 1b92f1e7..c380df8d 100644 --- a/drivers/gpu/nvgpu/gv100/hal_gv100.c +++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c @@ -699,7 +699,7 @@ static const struct gpu_ops gv100_ops = { .enable_snapshot = gv11b_css_hw_enable_snapshot, .disable_snapshot = gv11b_css_hw_disable_snapshot, .check_data_available = gv11b_css_hw_check_data_available, - .set_handled_snapshots = gv11b_css_hw_set_handled_snapshots, + .set_handled_snapshots = css_hw_set_handled_snapshots, .allocate_perfmon_ids = css_gr_allocate_perfmon_ids, .release_perfmon_ids = css_gr_release_perfmon_ids, }, 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) { diff --git a/drivers/gpu/nvgpu/gv11b/css_gr_gv11b.h b/drivers/gpu/nvgpu/gv11b/css_gr_gv11b.h index 186f5fcc..6b11a62e 100644 --- a/drivers/gpu/nvgpu/gv11b/css_gr_gv11b.h +++ b/drivers/gpu/nvgpu/gv11b/css_gr_gv11b.h @@ -30,6 +30,5 @@ int gv11b_css_hw_enable_snapshot(struct channel_gk20a *ch, void gv11b_css_hw_disable_snapshot(struct gr_gk20a *gr); int gv11b_css_hw_check_data_available(struct channel_gk20a *ch, u32 *pending, bool *hw_overflow); -void gv11b_css_hw_set_handled_snapshots(struct gk20a *g, u32 done); #endif /* CSS_GR_GV11B_H */ diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c index 8d78d524..5282af05 100644 --- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c @@ -688,7 +688,7 @@ static const struct gpu_ops gv11b_ops = { .enable_snapshot = gv11b_css_hw_enable_snapshot, .disable_snapshot = gv11b_css_hw_disable_snapshot, .check_data_available = gv11b_css_hw_check_data_available, - .set_handled_snapshots = gv11b_css_hw_set_handled_snapshots, + .set_handled_snapshots = css_hw_set_handled_snapshots, .allocate_perfmon_ids = css_gr_allocate_perfmon_ids, .release_perfmon_ids = css_gr_release_perfmon_ids, }, -- cgit v1.2.2