summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2017-04-25 16:13:05 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-05-24 15:14:08 -0400
commit92fe030e5250409ecd500dcf719547f3fb0f1873 (patch)
treeca603d4c2cb4b6d9e31dc9d7cf1a466163de8567 /drivers/gpu/nvgpu/gk20a/gr_gk20a.c
parentee25b33ca4aafbbab6e9b7cd963f9011a59037cd (diff)
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 <tbergstrom@nvidia.com> Reviewed-on: http://git-master/r/1469851 Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gr_gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/gr_gk20a.c6
1 files changed, 3 insertions, 3 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 */
5278void gk20a_gr_wait_initialized(struct gk20a *g) 5278void 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
8601void gk20a_init_gr(struct gk20a *g) 8601void 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
8606static bool gr_gk20a_is_tpc_addr(struct gk20a *g, u32 addr) 8606static bool gr_gk20a_is_tpc_addr(struct gk20a *g, u32 addr)