diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gp10b')
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/gr_gp10b.c | 12 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/pmu_gp10b.c | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c index e680e753..da121b56 100644 --- a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c | |||
@@ -1997,16 +1997,16 @@ static int gr_gp10b_suspend_contexts(struct gk20a *g, | |||
1997 | int local_ctx_resident_ch_fd = -1; | 1997 | int local_ctx_resident_ch_fd = -1; |
1998 | bool ctx_resident; | 1998 | bool ctx_resident; |
1999 | 1999 | ||
2000 | mutex_lock(&g->dbg_sessions_lock); | 2000 | nvgpu_mutex_acquire(&g->dbg_sessions_lock); |
2001 | 2001 | ||
2002 | err = gr_gk20a_disable_ctxsw(g); | 2002 | err = gr_gk20a_disable_ctxsw(g); |
2003 | if (err) { | 2003 | if (err) { |
2004 | gk20a_err(dev_from_gk20a(g), "unable to stop gr ctxsw"); | 2004 | gk20a_err(dev_from_gk20a(g), "unable to stop gr ctxsw"); |
2005 | mutex_unlock(&g->dbg_sessions_lock); | 2005 | nvgpu_mutex_release(&g->dbg_sessions_lock); |
2006 | goto clean_up; | 2006 | goto clean_up; |
2007 | } | 2007 | } |
2008 | 2008 | ||
2009 | mutex_lock(&dbg_s->ch_list_lock); | 2009 | nvgpu_mutex_acquire(&dbg_s->ch_list_lock); |
2010 | 2010 | ||
2011 | list_for_each_entry(ch_data, &dbg_s->ch_list, ch_entry) { | 2011 | list_for_each_entry(ch_data, &dbg_s->ch_list, ch_entry) { |
2012 | ch = g->fifo.channel + ch_data->chid; | 2012 | ch = g->fifo.channel + ch_data->chid; |
@@ -2019,15 +2019,15 @@ static int gr_gp10b_suspend_contexts(struct gk20a *g, | |||
2019 | cilp_preempt_pending_ch = ch; | 2019 | cilp_preempt_pending_ch = ch; |
2020 | } | 2020 | } |
2021 | 2021 | ||
2022 | mutex_unlock(&dbg_s->ch_list_lock); | 2022 | nvgpu_mutex_release(&dbg_s->ch_list_lock); |
2023 | 2023 | ||
2024 | err = gr_gk20a_enable_ctxsw(g); | 2024 | err = gr_gk20a_enable_ctxsw(g); |
2025 | if (err) { | 2025 | if (err) { |
2026 | mutex_unlock(&g->dbg_sessions_lock); | 2026 | nvgpu_mutex_release(&g->dbg_sessions_lock); |
2027 | goto clean_up; | 2027 | goto clean_up; |
2028 | } | 2028 | } |
2029 | 2029 | ||
2030 | mutex_unlock(&g->dbg_sessions_lock); | 2030 | nvgpu_mutex_release(&g->dbg_sessions_lock); |
2031 | 2031 | ||
2032 | if (cilp_preempt_pending_ch) { | 2032 | if (cilp_preempt_pending_ch) { |
2033 | struct channel_ctx_gk20a *ch_ctx = | 2033 | struct channel_ctx_gk20a *ch_ctx = |
diff --git a/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c b/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c index b989e6a4..9c565729 100644 --- a/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c | |||
@@ -306,10 +306,10 @@ static int gp10b_init_pmu_setup_hw1(struct gk20a *g) | |||
306 | 306 | ||
307 | gk20a_dbg_fn(""); | 307 | gk20a_dbg_fn(""); |
308 | 308 | ||
309 | mutex_lock(&pmu->isr_mutex); | 309 | nvgpu_mutex_acquire(&pmu->isr_mutex); |
310 | pmu_reset(pmu); | 310 | pmu_reset(pmu); |
311 | pmu->isr_enabled = true; | 311 | pmu->isr_enabled = true; |
312 | mutex_unlock(&pmu->isr_mutex); | 312 | nvgpu_mutex_release(&pmu->isr_mutex); |
313 | 313 | ||
314 | /* setup apertures - virtual */ | 314 | /* setup apertures - virtual */ |
315 | gk20a_writel(g, pwr_fbif_transcfg_r(GK20A_PMU_DMAIDX_UCODE), | 315 | gk20a_writel(g, pwr_fbif_transcfg_r(GK20A_PMU_DMAIDX_UCODE), |