diff options
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_gk20a.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index 1891d98f..4dc19091 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c | |||
@@ -5269,7 +5269,7 @@ int gk20a_init_gr_support(struct gk20a *g) | |||
5269 | gr_gk20a_enable_elcg(g); | 5269 | gr_gk20a_enable_elcg(g); |
5270 | /* GR is inialized, signal possible waiters */ | 5270 | /* GR is inialized, signal possible waiters */ |
5271 | g->gr.initialized = true; | 5271 | g->gr.initialized = true; |
5272 | wake_up(&g->gr.init_wq); | 5272 | nvgpu_cond_signal(&g->gr.init_wq); |
5273 | 5273 | ||
5274 | return 0; | 5274 | return 0; |
5275 | } | 5275 | } |
@@ -5277,7 +5277,7 @@ int gk20a_init_gr_support(struct gk20a *g) | |||
5277 | /* Wait until GR is initialized */ | 5277 | /* Wait until GR is initialized */ |
5278 | void gk20a_gr_wait_initialized(struct gk20a *g) | 5278 | void gk20a_gr_wait_initialized(struct gk20a *g) |
5279 | { | 5279 | { |
5280 | wait_event(g->gr.init_wq, g->gr.initialized); | 5280 | NVGPU_COND_WAIT(&g->gr.init_wq, g->gr.initialized, 0); |
5281 | } | 5281 | } |
5282 | 5282 | ||
5283 | #define NVA297_SET_ALPHA_CIRCULAR_BUFFER_SIZE 0x02dc | 5283 | #define NVA297_SET_ALPHA_CIRCULAR_BUFFER_SIZE 0x02dc |
@@ -8600,7 +8600,7 @@ void gr_gk20a_commit_global_pagepool(struct gk20a *g, | |||
8600 | 8600 | ||
8601 | void gk20a_init_gr(struct gk20a *g) | 8601 | void gk20a_init_gr(struct gk20a *g) |
8602 | { | 8602 | { |
8603 | init_waitqueue_head(&g->gr.init_wq); | 8603 | nvgpu_cond_init(&g->gr.init_wq); |
8604 | } | 8604 | } |
8605 | 8605 | ||
8606 | static bool gr_gk20a_is_tpc_addr(struct gk20a *g, u32 addr) | 8606 | static bool gr_gk20a_is_tpc_addr(struct gk20a *g, u32 addr) |
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h index bf936418..c1fba235 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h | |||
@@ -282,7 +282,7 @@ struct gr_gk20a { | |||
282 | #define GR_NETLIST_STATIC_A 'A' | 282 | #define GR_NETLIST_STATIC_A 'A' |
283 | int netlist; | 283 | int netlist; |
284 | 284 | ||
285 | wait_queue_head_t init_wq; | 285 | struct nvgpu_cond init_wq; |
286 | int initialized; | 286 | int initialized; |
287 | 287 | ||
288 | u32 num_fbps; | 288 | u32 num_fbps; |