diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2017-10-13 11:13:45 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-10-17 12:25:23 -0400 |
commit | 5c5b52dce54fa09d16ae38a232a0e17b4729b472 (patch) | |
tree | e1b6821896df1fd741db9baa831838340458c229 /drivers/gpu/nvgpu/gk20a/gk20a.h | |
parent | 682abd7b5cd544f83b8905830cd9b738c458be7f (diff) |
gpu: nvgpu: Use internal nvgpu_warpstate
Replace use of ioctl structure warpstate with internal
nvgpu_warptate.
JIRA NVGPU-259
Change-Id: I5170364d0443235cee471b87fa332fc09588f5d3
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1578684
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 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index 8efb009a..ead1f69e 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -41,6 +41,7 @@ struct nvgpu_clk_pll_debug_data; | |||
41 | struct nvgpu_nvhost_dev; | 41 | struct nvgpu_nvhost_dev; |
42 | struct nvgpu_cpu_time_correlation_sample; | 42 | struct nvgpu_cpu_time_correlation_sample; |
43 | struct nvgpu_mem_sgt; | 43 | struct nvgpu_mem_sgt; |
44 | struct nvgpu_warpstate; | ||
44 | 45 | ||
45 | #include <nvgpu/lock.h> | 46 | #include <nvgpu/lock.h> |
46 | #include <nvgpu/thread.h> | 47 | #include <nvgpu/thread.h> |
@@ -308,7 +309,7 @@ struct gpu_ops { | |||
308 | int (*set_sm_debug_mode)(struct gk20a *g, struct channel_gk20a *ch, | 309 | int (*set_sm_debug_mode)(struct gk20a *g, struct channel_gk20a *ch, |
309 | u64 sms, bool enable); | 310 | u64 sms, bool enable); |
310 | void (*bpt_reg_info)(struct gk20a *g, | 311 | void (*bpt_reg_info)(struct gk20a *g, |
311 | struct warpstate *w_state); | 312 | struct nvgpu_warpstate *w_state); |
312 | void (*get_access_map)(struct gk20a *g, | 313 | void (*get_access_map)(struct gk20a *g, |
313 | u32 **whitelist, int *num_entries); | 314 | u32 **whitelist, int *num_entries); |
314 | int (*handle_fecs_error)(struct gk20a *g, | 315 | int (*handle_fecs_error)(struct gk20a *g, |
@@ -407,7 +408,7 @@ struct gpu_ops { | |||
407 | void (*load_tpc_mask)(struct gk20a *g); | 408 | void (*load_tpc_mask)(struct gk20a *g); |
408 | int (*inval_icache)(struct gk20a *g, struct channel_gk20a *ch); | 409 | int (*inval_icache)(struct gk20a *g, struct channel_gk20a *ch); |
409 | int (*trigger_suspend)(struct gk20a *g); | 410 | int (*trigger_suspend)(struct gk20a *g); |
410 | int (*wait_for_pause)(struct gk20a *g, struct warpstate *w_state); | 411 | int (*wait_for_pause)(struct gk20a *g, struct nvgpu_warpstate *w_state); |
411 | int (*resume_from_pause)(struct gk20a *g); | 412 | int (*resume_from_pause)(struct gk20a *g); |
412 | int (*clear_sm_errors)(struct gk20a *g); | 413 | int (*clear_sm_errors)(struct gk20a *g); |
413 | u32 (*tpc_enabled_exceptions)(struct gk20a *g); | 414 | u32 (*tpc_enabled_exceptions)(struct gk20a *g); |