From db8bce518bcf2a1b46e5897f55469f348a16c9a2 Mon Sep 17 00:00:00 2001 From: Deepak Nibade Date: Mon, 17 Aug 2015 16:19:09 +0530 Subject: gpu: nvgpu: wakeup semaphores after clearing CE2 interrupt In gk20a_ce2_nonstall_isr(), we first invoke semaphore workqueue on all channels and then clear the interrupt This delay in clearing the interrupt can sometimes lead to dropping of new interrupt If that happens, we never invoke gk20a_channel_semaphore_wakeup() for new semaphore interrupts and semaphore waiting never completes. Fix this by moving gk20a_channel_semaphore_wakeup() after we clear the interrupt Bug 200131938 Change-Id: I26d72f04a8b49f4a3ac326bf6037cd04c741a920 Signed-off-by: Deepak Nibade Reviewed-on: http://git-master/r/784771 Reviewed-by: Konsta Holtta Reviewed-by: Seshendra Gadagottu Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/gk20a/ce2_gk20a.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'drivers/gpu') diff --git a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c index ce23c59a..3a0f20a9 100644 --- a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c @@ -41,8 +41,6 @@ static u32 ce2_nonblockpipe_isr(struct gk20a *g, u32 fifo_intr) { gk20a_dbg(gpu_dbg_intr, "ce2 non-blocking pipe interrupt\n"); - /* wake theads waiting in this channel */ - gk20a_channel_semaphore_wakeup(g); return ce2_intr_status_nonblockpipe_pending_f(); } @@ -81,14 +79,16 @@ void gk20a_ce2_isr(struct gk20a *g) void gk20a_ce2_nonstall_isr(struct gk20a *g) { u32 ce2_intr = gk20a_readl(g, ce2_intr_status_r()); - u32 clear_intr = 0; gk20a_dbg(gpu_dbg_intr, "ce2 nonstall isr %08x\n", ce2_intr); - if (ce2_intr & ce2_intr_status_nonblockpipe_pending_f()) - clear_intr |= ce2_nonblockpipe_isr(g, ce2_intr); + if (ce2_intr & ce2_intr_status_nonblockpipe_pending_f()) { + gk20a_writel(g, ce2_intr_status_r(), + ce2_nonblockpipe_isr(g, ce2_intr)); - gk20a_writel(g, ce2_intr_status_r(), clear_intr); + /* wake threads waiting in this channel */ + gk20a_channel_semaphore_wakeup(g); + } return; } -- cgit v1.2.2