diff options
author | seshendra Gadagottu <sgadagottu@nvidia.com> | 2018-03-06 16:25:11 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-03-12 13:40:17 -0400 |
commit | 3df619f68afa6b23a33d7da072315755de38a30b (patch) | |
tree | df397177061e6c1f04ecba6959299504cbb9597c /drivers/gpu/nvgpu/gv11b | |
parent | 7a5a2fb75a7c4990939593437af72febf01b732d (diff) |
gpu: nvgpu: hal for syncpt_incr_per_release
Create hal to indicate syncpt increments per release.
Legacy chip uses 2 syncpt increments per release and gv1xx
onwards uses 1 syncpt increment per release.
Bug 2066025
Change-Id: I5d6d0a5368ef561f8150fbb7120181f49f6e338b
Signed-off-by: seshendra Gadagottu <sgadagottu@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1669817
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gv11b')
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/fifo_gv11b.c | 5 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/fifo_gv11b.h | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/hal_gv11b.c | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c index ef76e76b..4050579e 100644 --- a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c | |||
@@ -1779,6 +1779,11 @@ u32 gv11b_fifo_get_syncpt_wait_cmd_size(void) | |||
1779 | return 8; | 1779 | return 8; |
1780 | } | 1780 | } |
1781 | 1781 | ||
1782 | u32 gv11b_fifo_get_syncpt_incr_per_release(void) | ||
1783 | { | ||
1784 | return 1; | ||
1785 | } | ||
1786 | |||
1782 | void gv11b_fifo_add_syncpt_incr_cmd(struct gk20a *g, | 1787 | void gv11b_fifo_add_syncpt_incr_cmd(struct gk20a *g, |
1783 | bool wfi_cmd, struct priv_cmd_entry *cmd, | 1788 | bool wfi_cmd, struct priv_cmd_entry *cmd, |
1784 | u32 id, u64 gpu_va) | 1789 | u32 id, u64 gpu_va) |
diff --git a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.h b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.h index c0e6e5cd..2bd82d5f 100644 --- a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.h +++ b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.h | |||
@@ -108,6 +108,7 @@ void gv11b_fifo_add_syncpt_wait_cmd(struct gk20a *g, | |||
108 | struct priv_cmd_entry *cmd, u32 off, | 108 | struct priv_cmd_entry *cmd, u32 off, |
109 | u32 id, u32 thresh, u64 gpu_va_base); | 109 | u32 id, u32 thresh, u64 gpu_va_base); |
110 | u32 gv11b_fifo_get_syncpt_wait_cmd_size(void); | 110 | u32 gv11b_fifo_get_syncpt_wait_cmd_size(void); |
111 | u32 gv11b_fifo_get_syncpt_incr_per_release(void); | ||
111 | void gv11b_fifo_add_syncpt_incr_cmd(struct gk20a *g, | 112 | void gv11b_fifo_add_syncpt_incr_cmd(struct gk20a *g, |
112 | bool wfi_cmd, struct priv_cmd_entry *cmd, | 113 | bool wfi_cmd, struct priv_cmd_entry *cmd, |
113 | u32 id, u64 gpu_va_base); | 114 | u32 id, u64 gpu_va_base); |
diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c index 86bdc884..1fe09827 100644 --- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c | |||
@@ -531,6 +531,8 @@ static const struct gpu_ops gv11b_ops = { | |||
531 | .get_syncpt_wait_cmd_size = gv11b_fifo_get_syncpt_wait_cmd_size, | 531 | .get_syncpt_wait_cmd_size = gv11b_fifo_get_syncpt_wait_cmd_size, |
532 | .add_syncpt_incr_cmd = gv11b_fifo_add_syncpt_incr_cmd, | 532 | .add_syncpt_incr_cmd = gv11b_fifo_add_syncpt_incr_cmd, |
533 | .get_syncpt_incr_cmd_size = gv11b_fifo_get_syncpt_incr_cmd_size, | 533 | .get_syncpt_incr_cmd_size = gv11b_fifo_get_syncpt_incr_cmd_size, |
534 | .get_syncpt_incr_per_release = | ||
535 | gv11b_fifo_get_syncpt_incr_per_release, | ||
534 | .get_sync_ro_map = gv11b_fifo_get_sync_ro_map, | 536 | .get_sync_ro_map = gv11b_fifo_get_sync_ro_map, |
535 | #endif | 537 | #endif |
536 | .resetup_ramfc = NULL, | 538 | .resetup_ramfc = NULL, |