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 @@
 #include "gr_ctx_gk20a.h"
 #include "mm_gk20a.h"
 
+#include <nvgpu/comptags.h>
+
 #define GR_IDLE_CHECK_DEFAULT           10 /* usec */
 #define GR_IDLE_CHECK_MAX               200 /* usec */
 #define GR_FECS_POLL_INTERVAL           5 /* usec */
@@ -342,13 +344,7 @@ struct gr_gk20a {
 
         u32 max_comptag_mem; /* max memory size (MB) for comptag */
         struct compbit_store_desc compbit_store;
-        struct gk20a_comptag_allocator {
-                struct nvgpu_mutex lock;
-                /* this bitmap starts at ctag 1. 0th cannot be taken */
-                unsigned long *bitmap;
-                /* size of bitmap, not max ctags, so one less */
-                unsigned long size;
-        } comp_tags;
+        struct gk20a_comptag_allocator comp_tags;
 
         struct gr_zcull_gk20a zcull;
 
@@ -503,10 +499,6 @@ int gk20a_init_gr_support(struct gk20a *g);
 int gk20a_enable_gr_hw(struct gk20a *g);
 int gk20a_gr_reset(struct gk20a *g);
 void gk20a_gr_wait_initialized(struct gk20a *g);
-/* real size here, but first (ctag 0) isn't used */
-int gk20a_comptag_allocator_init(struct gk20a_comptag_allocator *allocator,
-                unsigned long size);
-void gk20a_comptag_allocator_destroy(struct gk20a_comptag_allocator *allocator);
 
 int gk20a_init_gr_channel(struct channel_gk20a *ch_gk20a);