diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gr_gk20a.h')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_gk20a.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h index 5fab43ca..84eb8970 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h | |||
@@ -36,6 +36,8 @@ | |||
36 | #include "gr_ctx_gk20a.h" | 36 | #include "gr_ctx_gk20a.h" |
37 | #include "mm_gk20a.h" | 37 | #include "mm_gk20a.h" |
38 | 38 | ||
39 | #include <nvgpu/comptags.h> | ||
40 | |||
39 | #define GR_IDLE_CHECK_DEFAULT 10 /* usec */ | 41 | #define GR_IDLE_CHECK_DEFAULT 10 /* usec */ |
40 | #define GR_IDLE_CHECK_MAX 200 /* usec */ | 42 | #define GR_IDLE_CHECK_MAX 200 /* usec */ |
41 | #define GR_FECS_POLL_INTERVAL 5 /* usec */ | 43 | #define GR_FECS_POLL_INTERVAL 5 /* usec */ |
@@ -342,13 +344,7 @@ struct gr_gk20a { | |||
342 | 344 | ||
343 | u32 max_comptag_mem; /* max memory size (MB) for comptag */ | 345 | u32 max_comptag_mem; /* max memory size (MB) for comptag */ |
344 | struct compbit_store_desc compbit_store; | 346 | struct compbit_store_desc compbit_store; |
345 | struct gk20a_comptag_allocator { | 347 | struct gk20a_comptag_allocator comp_tags; |
346 | struct nvgpu_mutex lock; | ||
347 | /* this bitmap starts at ctag 1. 0th cannot be taken */ | ||
348 | unsigned long *bitmap; | ||
349 | /* size of bitmap, not max ctags, so one less */ | ||
350 | unsigned long size; | ||
351 | } comp_tags; | ||
352 | 348 | ||
353 | struct gr_zcull_gk20a zcull; | 349 | struct gr_zcull_gk20a zcull; |
354 | 350 | ||
@@ -503,10 +499,6 @@ int gk20a_init_gr_support(struct gk20a *g); | |||
503 | int gk20a_enable_gr_hw(struct gk20a *g); | 499 | int gk20a_enable_gr_hw(struct gk20a *g); |
504 | int gk20a_gr_reset(struct gk20a *g); | 500 | int gk20a_gr_reset(struct gk20a *g); |
505 | void gk20a_gr_wait_initialized(struct gk20a *g); | 501 | void gk20a_gr_wait_initialized(struct gk20a *g); |
506 | /* real size here, but first (ctag 0) isn't used */ | ||
507 | int gk20a_comptag_allocator_init(struct gk20a_comptag_allocator *allocator, | ||
508 | unsigned long size); | ||
509 | void gk20a_comptag_allocator_destroy(struct gk20a_comptag_allocator *allocator); | ||
510 | 502 | ||
511 | int gk20a_init_gr_channel(struct channel_gk20a *ch_gk20a); | 503 | int gk20a_init_gr_channel(struct channel_gk20a *ch_gk20a); |
512 | 504 | ||