From 92fe030e5250409ecd500dcf719547f3fb0f1873 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Tue, 25 Apr 2017 13:13:05 -0700 Subject: gpu: nvgpu: Use nvgpu_cond in gr init_wq Change graphics initialization wait queue to use nvgpu_cond instead of Linux wait queue. JIRA NVGPU-14 Change-Id: I55ed64c29856947798e927ffaa5f1dbb1683b977 Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/1469851 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/gr_gk20a.c') 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) gr_gk20a_enable_elcg(g); /* GR is inialized, signal possible waiters */ g->gr.initialized = true; - wake_up(&g->gr.init_wq); + nvgpu_cond_signal(&g->gr.init_wq); return 0; } @@ -5277,7 +5277,7 @@ int gk20a_init_gr_support(struct gk20a *g) /* Wait until GR is initialized */ void gk20a_gr_wait_initialized(struct gk20a *g) { - wait_event(g->gr.init_wq, g->gr.initialized); + NVGPU_COND_WAIT(&g->gr.init_wq, g->gr.initialized, 0); } #define NVA297_SET_ALPHA_CIRCULAR_BUFFER_SIZE 0x02dc @@ -8600,7 +8600,7 @@ void gr_gk20a_commit_global_pagepool(struct gk20a *g, void gk20a_init_gr(struct gk20a *g) { - init_waitqueue_head(&g->gr.init_wq); + nvgpu_cond_init(&g->gr.init_wq); } static bool gr_gk20a_is_tpc_addr(struct gk20a *g, u32 addr) -- cgit v1.2.2