summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/ce2_gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/ce2_gk20a.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c
index db1ac539..3fed937e 100644
--- a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c
@@ -76,8 +76,9 @@ void gk20a_ce2_isr(struct gk20a *g, u32 inst_id, u32 pri_base)
76 return; 76 return;
77} 77}
78 78
79void gk20a_ce2_nonstall_isr(struct gk20a *g, u32 inst_id, u32 pri_base) 79int gk20a_ce2_nonstall_isr(struct gk20a *g, u32 inst_id, u32 pri_base)
80{ 80{
81 int ops = 0;
81 u32 ce2_intr = gk20a_readl(g, ce2_intr_status_r()); 82 u32 ce2_intr = gk20a_readl(g, ce2_intr_status_r());
82 83
83 gk20a_dbg(gpu_dbg_intr, "ce2 nonstall isr %08x\n", ce2_intr); 84 gk20a_dbg(gpu_dbg_intr, "ce2 nonstall isr %08x\n", ce2_intr);
@@ -85,12 +86,10 @@ void gk20a_ce2_nonstall_isr(struct gk20a *g, u32 inst_id, u32 pri_base)
85 if (ce2_intr & ce2_intr_status_nonblockpipe_pending_f()) { 86 if (ce2_intr & ce2_intr_status_nonblockpipe_pending_f()) {
86 gk20a_writel(g, ce2_intr_status_r(), 87 gk20a_writel(g, ce2_intr_status_r(),
87 ce2_nonblockpipe_isr(g, ce2_intr)); 88 ce2_nonblockpipe_isr(g, ce2_intr));
88 89 ops |= (gk20a_nonstall_ops_wakeup_semaphore |
89 /* wake threads waiting in this channel */ 90 gk20a_nonstall_ops_post_events);
90 gk20a_channel_semaphore_wakeup(g, true);
91 } 91 }
92 92 return ops;
93 return;
94} 93}
95void gk20a_init_ce2(struct gpu_ops *gops) 94void gk20a_init_ce2(struct gpu_ops *gops)
96{ 95{