diff options
author | Sam Payne <spayne@nvidia.com> | 2015-01-26 17:02:25 -0500 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2015-04-04 21:08:17 -0400 |
commit | ce3afaaaf6092f46b2db0f8835e4d4b9b46ef1a4 (patch) | |
tree | bd06822411f5601c5ea5c7a9059c1d2c7710c64e /drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | |
parent | f3a920cb01d1517db5432c8062b660d6b60eb4de (diff) |
gpu: nvgpu: disable ce2 interrupts when unhandled
ce2 interrupts enabled only on gk20a and gm20b when
interrupts are handled through hal
Change-Id: Ib570db8f5f41e71e768b95e781153ec8a5d20015
Signed-off-by: Sam Payne <spayne@nvidia.com>
Reviewed-on: http://git-master/r/677447
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/fifo_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c index b9183e76..cf1242ab 100644 --- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | |||
@@ -145,6 +145,9 @@ u32 gk20a_fifo_engine_interrupt_mask(struct gk20a *g) | |||
145 | 145 | ||
146 | for (i = 0; i < g->fifo.max_engines; i++) { | 146 | for (i = 0; i < g->fifo.max_engines; i++) { |
147 | u32 intr_id = g->fifo.engine_info[i].intr_id; | 147 | u32 intr_id = g->fifo.engine_info[i].intr_id; |
148 | if (i == ENGINE_CE2_GK20A && | ||
149 | (!g->ops.ce2.isr_stall || !g->ops.ce2.isr_nonstall)) | ||
150 | continue; | ||
148 | 151 | ||
149 | if (intr_id) | 152 | if (intr_id) |
150 | eng_intr_mask |= BIT(intr_id); | 153 | eng_intr_mask |= BIT(intr_id); |