From a83c99ecb41c5fa0b287efafa22db0e9770ab3e4 Mon Sep 17 00:00:00 2001 From: Martin Radev Date: Mon, 5 Mar 2018 14:12:10 +0200 Subject: gpu: nvgpu: Use gv11b_css_hw_set_handled_snapshots for GV11B The value of NV_PERF_PMASYS_MEM_BUMP is different for Volta and NVGPU_IOCTL_CHANNEL_CYCLE_STATS_SNAPSHOT_CMD_FLUSH did not have correct behavior on GV11B due to that. The patch adds an instance of css_hw_set_handled_snapshots for Volta to fix that. Bug 1960846 Bug 2068936 Change-Id: Ic057338d3b1b951a66d070267e69a90f136598b9 Signed-off-by: Martin Radev Reviewed-on: https://git-master.nvidia.com/r/1668568 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gv100/hal_gv100.c | 2 +- drivers/gpu/nvgpu/gv11b/css_gr_gv11b.c | 18 +++++++++--------- drivers/gpu/nvgpu/gv11b/css_gr_gv11b.h | 1 + drivers/gpu/nvgpu/gv11b/hal_gv11b.c | 2 +- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c index 802a43af..70fceea9 100644 --- a/drivers/gpu/nvgpu/gv100/hal_gv100.c +++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c @@ -707,7 +707,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 = css_hw_set_handled_snapshots, + .set_handled_snapshots = gv11b_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 86977bb3..bb7c37bd 100644 --- a/drivers/gpu/nvgpu/gv11b/css_gr_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/css_gr_gv11b.c @@ -57,15 +57,6 @@ 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) { @@ -86,6 +77,15 @@ 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 > 0) { + 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 6b11a62e..186f5fcc 100644 --- a/drivers/gpu/nvgpu/gv11b/css_gr_gv11b.h +++ b/drivers/gpu/nvgpu/gv11b/css_gr_gv11b.h @@ -30,5 +30,6 @@ 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 2443a4b1..86bdc884 100644 --- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c @@ -695,7 +695,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 = css_hw_set_handled_snapshots, + .set_handled_snapshots = gv11b_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