summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gp10b/mc_gp10b.c
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2016-05-13 15:22:21 -0400
committerDeepak Nibade <dnibade@nvidia.com>2016-12-27 04:56:15 -0500
commit1f225fa73167ec31c9332e4031c156d8b04a41f6 (patch)
treee8fe7949af669bf7bd7bfaf0766946d63b079303 /drivers/gpu/nvgpu/gp10b/mc_gp10b.c
parent2580fa57fb4d1c0b6c002bade851a358ac867b24 (diff)
gpu: nvgpu: Implement engine_enum_from_type
Implement a helper function engine_enum_from_type. This allows parsing device_info entries for LCE engine type. Pascal has logical copy engine instead of CE2, so so add definition of that. Change-Id: I71f59c308641d84ac59fd57fc37d9b627bb07a43 Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: http://git-master/r/1147747 Reviewed-by: Konsta Holtta <kholtta@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gp10b/mc_gp10b.c')
-rw-r--r--drivers/gpu/nvgpu/gp10b/mc_gp10b.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/mc_gp10b.c b/drivers/gpu/nvgpu/gp10b/mc_gp10b.c
index 47c8fcc6..4d9573d1 100644
--- a/drivers/gpu/nvgpu/gp10b/mc_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/mc_gp10b.c
@@ -108,9 +108,9 @@ irqreturn_t mc_gp10b_intr_thread_stall(struct gk20a *g)
108 108
109 gk20a_dbg(gpu_dbg_intr, "stall intr %08x\n", mc_intr_0); 109 gk20a_dbg(gpu_dbg_intr, "stall intr %08x\n", mc_intr_0);
110 110
111 if (mc_intr_0 & BIT(g->fifo.engine_info[ENGINE_GR_GK20A].intr_id)) 111 if (mc_intr_0 & g->fifo.engine_info[ENGINE_GR_GK20A].intr_mask)
112 gr_gk20a_elpg_protected_call(g, gk20a_gr_isr(g)); 112 gr_gk20a_elpg_protected_call(g, gk20a_gr_isr(g));
113 if (mc_intr_0 & BIT(g->fifo.engine_info[ENGINE_CE2_GK20A].intr_id) 113 if (mc_intr_0 & g->fifo.engine_info[ENGINE_CE2_GK20A].intr_mask
114 && g->ops.ce2.isr_stall) 114 && g->ops.ce2.isr_stall)
115 g->ops.ce2.isr_stall(g); 115 g->ops.ce2.isr_stall(g);
116 if (mc_intr_0 & mc_intr_pfifo_pending_f()) 116 if (mc_intr_0 & mc_intr_pfifo_pending_f())
@@ -142,9 +142,9 @@ irqreturn_t mc_gp10b_intr_thread_nonstall(struct gk20a *g)
142 142
143 if (mc_intr_1 & mc_intr_pfifo_pending_f()) 143 if (mc_intr_1 & mc_intr_pfifo_pending_f())
144 gk20a_fifo_nonstall_isr(g); 144 gk20a_fifo_nonstall_isr(g);
145 if (mc_intr_1 & BIT(g->fifo.engine_info[ENGINE_GR_GK20A].intr_id)) 145 if (mc_intr_1 & g->fifo.engine_info[ENGINE_GR_GK20A].intr_mask)
146 gk20a_gr_nonstall_isr(g); 146 gk20a_gr_nonstall_isr(g);
147 if (mc_intr_1 & BIT(g->fifo.engine_info[ENGINE_CE2_GK20A].intr_id) 147 if (mc_intr_1 & g->fifo.engine_info[ENGINE_CE2_GK20A].intr_mask
148 && g->ops.ce2.isr_nonstall) 148 && g->ops.ce2.isr_nonstall)
149 g->ops.ce2.isr_nonstall(g); 149 g->ops.ce2.isr_nonstall(g);
150 150