diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.h')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index 5300f7dd..cf202f14 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -207,7 +207,7 @@ struct gpu_ops { | |||
207 | } ltc; | 207 | } ltc; |
208 | struct { | 208 | struct { |
209 | void (*isr_stall)(struct gk20a *g, u32 inst_id, u32 pri_base); | 209 | void (*isr_stall)(struct gk20a *g, u32 inst_id, u32 pri_base); |
210 | int (*isr_nonstall)(struct gk20a *g, u32 inst_id, u32 pri_base); | 210 | u32 (*isr_nonstall)(struct gk20a *g, u32 inst_id, u32 pri_base); |
211 | u32 (*get_num_pce)(struct gk20a *g); | 211 | u32 (*get_num_pce)(struct gk20a *g); |
212 | } ce2; | 212 | } ce2; |
213 | struct { | 213 | struct { |
@@ -1668,10 +1668,8 @@ struct gk20a_cyclestate_buffer_elem { | |||
1668 | }; | 1668 | }; |
1669 | 1669 | ||
1670 | /* operations that will need to be executed on non stall workqueue */ | 1670 | /* operations that will need to be executed on non stall workqueue */ |
1671 | enum gk20a_nonstall_ops { | 1671 | #define GK20A_NONSTALL_OPS_WAKEUP_SEMAPHORE BIT32(0) |
1672 | gk20a_nonstall_ops_wakeup_semaphore = BIT(0), /* wake up semaphore */ | 1672 | #define GK20A_NONSTALL_OPS_POST_EVENTS BIT32(1) |
1673 | gk20a_nonstall_ops_post_events = BIT(1), | ||
1674 | }; | ||
1675 | 1673 | ||
1676 | /* register accessors */ | 1674 | /* register accessors */ |
1677 | void __nvgpu_check_gpu_state(struct gk20a *g); | 1675 | void __nvgpu_check_gpu_state(struct gk20a *g); |