diff options
author | Alex Waterman <alexw@nvidia.com> | 2016-12-16 15:29:34 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-01-18 19:46:33 -0500 |
commit | 6e2237ef622113b8fa1149aa48988a99fa30594f (patch) | |
tree | 1356c45dda5751f7094f37aa93019f1199b635fb /drivers/gpu/nvgpu/gk20a/gk20a.h | |
parent | 8f5a42c4bf9c323b86452065d39ed7632b126561 (diff) |
gpu: nvgpu: Use timer API in gk20a code
Use the timers API in the gk20a code instead of Linux specific
API calls.
This also changes the behavior of several functions to wait for
the full timeout for each operation that can timeout. Previously
the timeout was shared across each operation.
Bug 1799159
Change-Id: I2bbed54630667b2b879b56a63a853266afc1e5d8
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/1273826
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.h')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index 00a580dd..6ca5855a 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -270,8 +270,8 @@ struct gpu_ops { | |||
270 | u32 (*get_max_lts_per_ltc)(struct gk20a *g); | 270 | u32 (*get_max_lts_per_ltc)(struct gk20a *g); |
271 | u32* (*get_rop_l2_en_mask)(struct gk20a *g); | 271 | u32* (*get_rop_l2_en_mask)(struct gk20a *g); |
272 | void (*init_sm_dsm_reg_info)(void); | 272 | void (*init_sm_dsm_reg_info)(void); |
273 | int (*wait_empty)(struct gk20a *g, unsigned long end_jiffies, | 273 | int (*wait_empty)(struct gk20a *g, unsigned long duration_ms, |
274 | u32 expect_delay); | 274 | u32 expect_delay); |
275 | void (*init_cyclestats)(struct gk20a *g); | 275 | void (*init_cyclestats)(struct gk20a *g); |
276 | void (*enable_cde_in_fecs)(struct gk20a *g, | 276 | void (*enable_cde_in_fecs)(struct gk20a *g, |
277 | struct mem_desc *mem); | 277 | struct mem_desc *mem); |