diff options
author | Konsta Holtta <kholtta@nvidia.com> | 2017-05-22 05:20:40 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-05-24 15:14:19 -0400 |
commit | a5fc5e7131add41f2d9b4bbba2a9d0f318897331 (patch) | |
tree | 646f6e65094ef02eba5ffb1a0045dce11af6d5a8 /drivers | |
parent | c771d0b979cd9f42a21da520d5010873d2a6aa47 (diff) |
gpu: nvgpu: gv11b: implement userd_pb_get
Add gv11b_userd_pb_get() to read the userd get pointer for watchdog.
Jira NVGPU-72
Change-Id: Ie1cdb9f84edcecd70b44b6e5a6a8bc554ad5bf49
Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-on: http://git-master/r/1486956
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/fifo_gv11b.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c index df7ab5af..a153de7c 100644 --- a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c | |||
@@ -202,6 +202,16 @@ static u32 gv11b_userd_gp_get(struct gk20a *g, struct channel_gk20a *c) | |||
202 | offset + ram_userd_gp_get_w()); | 202 | offset + ram_userd_gp_get_w()); |
203 | } | 203 | } |
204 | 204 | ||
205 | static u64 gv11b_userd_pb_get(struct gk20a *g, struct channel_gk20a *c) | ||
206 | { | ||
207 | struct nvgpu_mem *userd_mem = &g->fifo.userd; | ||
208 | u32 offset = c->hw_chid * (g->fifo.userd_entry_size / sizeof(u32)); | ||
209 | u32 lo = nvgpu_mem_rd32(g, userd_mem, offset + ram_userd_get_w()); | ||
210 | u32 hi = nvgpu_mem_rd32(g, userd_mem, offset + ram_userd_get_hi_w()); | ||
211 | |||
212 | return ((u64)hi << 32) | lo; | ||
213 | } | ||
214 | |||
205 | static void gv11b_userd_gp_put(struct gk20a *g, struct channel_gk20a *c) | 215 | static void gv11b_userd_gp_put(struct gk20a *g, struct channel_gk20a *c) |
206 | { | 216 | { |
207 | struct nvgpu_mem *userd_mem = &g->fifo.userd; | 217 | struct nvgpu_mem *userd_mem = &g->fifo.userd; |
@@ -1412,6 +1422,7 @@ void gv11b_init_fifo(struct gpu_ops *gops) | |||
1412 | gops->fifo.get_num_fifos = gv11b_fifo_get_num_fifos; | 1422 | gops->fifo.get_num_fifos = gv11b_fifo_get_num_fifos; |
1413 | gops->fifo.userd_gp_get = gv11b_userd_gp_get; | 1423 | gops->fifo.userd_gp_get = gv11b_userd_gp_get; |
1414 | gops->fifo.userd_gp_put = gv11b_userd_gp_put; | 1424 | gops->fifo.userd_gp_put = gv11b_userd_gp_put; |
1425 | gops->fifo.userd_pb_get = gv11b_userd_pb_get; | ||
1415 | gops->fifo.setup_ramfc = channel_gv11b_setup_ramfc; | 1426 | gops->fifo.setup_ramfc = channel_gv11b_setup_ramfc; |
1416 | gops->fifo.resetup_ramfc = NULL; | 1427 | gops->fifo.resetup_ramfc = NULL; |
1417 | gops->fifo.unbind_channel = channel_gv11b_unbind; | 1428 | gops->fifo.unbind_channel = channel_gv11b_unbind; |