summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/mc_gk20a.c
diff options
context:
space:
mode:
authorSam Payne <spayne@nvidia.com>2015-01-12 17:24:55 -0500
committerDan Willemsen <dwillemsen@nvidia.com>2015-04-04 21:02:35 -0400
commitedaf6188d54683bd955f1dc6673b3bb3ba18367e (patch)
tree68e95507fb3fed06da3d8a381d113a822d329ed6 /drivers/gpu/nvgpu/gk20a/mc_gk20a.c
parent3764ce3de36d9b01948a78ec1ecf4ac4371b8e4d (diff)
gpu: nvgpu: enable ce2 interrupts
enables non-blocking interrupts in ce2 all other ce2 interrupts are cleared and not handled. bug 200036089 Change-Id: I9f47b06c677c72ac523019e6a3f70fedd07830a2 Signed-off-by: Sam Payne <spayne@nvidia.com> Reviewed-on: http://git-master/r/671783 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/mc_gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/mc_gk20a.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/mc_gk20a.c b/drivers/gpu/nvgpu/gk20a/mc_gk20a.c
index 899eeff7..9f9e756b 100644
--- a/drivers/gpu/nvgpu/gk20a/mc_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/mc_gk20a.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * GK20A memory interface 2 * GK20A memory interface
3 * 3 *
4 * Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved. 4 * Copyright (c) 2014-2015, NVIDIA CORPORATION. All rights reserved.
5 * 5 *
6 * This program is free software; you can redistribute it and/or modify it 6 * This program is free software; you can redistribute it and/or modify it
7 * under the terms and conditions of the GNU General Public License, 7 * under the terms and conditions of the GNU General Public License,
@@ -73,6 +73,8 @@ irqreturn_t mc_gk20a_intr_thread_stall(struct gk20a *g)
73 73
74 if (mc_intr_0 & BIT(g->fifo.engine_info[ENGINE_GR_GK20A].intr_id)) 74 if (mc_intr_0 & BIT(g->fifo.engine_info[ENGINE_GR_GK20A].intr_id))
75 gr_gk20a_elpg_protected_call(g, gk20a_gr_isr(g)); 75 gr_gk20a_elpg_protected_call(g, gk20a_gr_isr(g));
76 if (mc_intr_0 & BIT(g->fifo.engine_info[ENGINE_CE2_GK20A].intr_id))
77 gk20a_ce2_isr(g);
76 if (mc_intr_0 & mc_intr_0_pfifo_pending_f()) 78 if (mc_intr_0 & mc_intr_0_pfifo_pending_f())
77 gk20a_fifo_isr(g); 79 gk20a_fifo_isr(g);
78 if (mc_intr_0 & mc_intr_0_pmu_pending_f()) 80 if (mc_intr_0 & mc_intr_0_pmu_pending_f())
@@ -107,6 +109,8 @@ irqreturn_t mc_gk20a_intr_thread_nonstall(struct gk20a *g)
107 gk20a_fifo_nonstall_isr(g); 109 gk20a_fifo_nonstall_isr(g);
108 if (mc_intr_1 & BIT(g->fifo.engine_info[ENGINE_GR_GK20A].intr_id)) 110 if (mc_intr_1 & BIT(g->fifo.engine_info[ENGINE_GR_GK20A].intr_id))
109 gk20a_gr_nonstall_isr(g); 111 gk20a_gr_nonstall_isr(g);
112 if (mc_intr_1 & BIT(g->fifo.engine_info[ENGINE_CE2_GK20A].intr_id))
113 gk20a_ce2_nonstall_isr(g);
110 114
111 gk20a_writel(g, mc_intr_en_1_r(), 115 gk20a_writel(g, mc_intr_en_1_r(),
112 mc_intr_en_1_inta_hardware_f()); 116 mc_intr_en_1_inta_hardware_f());