diff options
author | Srikar Srimath Tirumala <srikars@nvidia.com> | 2018-02-26 18:29:36 -0500 |
---|---|---|
committer | Srikar Srimath Tirumala <srikars@nvidia.com> | 2018-02-26 22:01:16 -0500 |
commit | a26de1185a9cc894d37ea826f67ba4f34a646fb3 (patch) | |
tree | 46978009c79ebc707502a25fd298bad80f4bdb57 /drivers/gpu/nvgpu/gk20a | |
parent | c0196d50032c218b83cc6e5a655bc82fe75c45f7 (diff) |
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 <srikars@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1664647
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/css_gr_gk20a.h | 2 |
2 files changed, 3 insertions, 3 deletions
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) | |||
75 | } | 75 | } |
76 | 76 | ||
77 | /* informs hw how many snapshots have been processed (frees up fifo space) */ | 77 | /* informs hw how many snapshots have been processed (frees up fifo space) */ |
78 | void gk20a_css_hw_set_handled_snapshots(struct gk20a *g, u32 done) | 78 | void css_hw_set_handled_snapshots(struct gk20a *g, u32 done) |
79 | { | 79 | { |
80 | if (done > 0) { | 80 | if (done > 0) { |
81 | gk20a_writel(g, perf_pmasys_mem_bump_r(), | 81 | gk20a_writel(g, perf_pmasys_mem_bump_r(), |
@@ -102,7 +102,7 @@ static void css_hw_reset_streaming(struct gk20a *g) | |||
102 | perf_pmasys_control_membuf_clear_status_doit_f()); | 102 | perf_pmasys_control_membuf_clear_status_doit_f()); |
103 | 103 | ||
104 | /* pointing all pending snapshots as handled */ | 104 | /* pointing all pending snapshots as handled */ |
105 | gk20a_css_hw_set_handled_snapshots(g, css_hw_get_pending_snapshots(g)); | 105 | css_hw_set_handled_snapshots(g, css_hw_get_pending_snapshots(g)); |
106 | } | 106 | } |
107 | 107 | ||
108 | /* | 108 | /* |
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 { | |||
129 | struct gk20a_cs_snapshot_fifo_entry *hw_get; | 129 | struct gk20a_cs_snapshot_fifo_entry *hw_get; |
130 | }; | 130 | }; |
131 | 131 | ||
132 | void gk20a_css_hw_set_handled_snapshots(struct gk20a *g, u32 done); | 132 | void css_hw_set_handled_snapshots(struct gk20a *g, u32 done); |
133 | int css_hw_enable_snapshot(struct channel_gk20a *ch, | 133 | int css_hw_enable_snapshot(struct channel_gk20a *ch, |
134 | struct gk20a_cs_snapshot_client *cs_client); | 134 | struct gk20a_cs_snapshot_client *cs_client); |
135 | void css_hw_disable_snapshot(struct gr_gk20a *gr); | 135 | void css_hw_disable_snapshot(struct gr_gk20a *gr); |