gpu: nvgpu: Retrieve intr & reset id from HW

Query interrupt number and reset id from HW. Use the number
from HW when enabling and detecting interrupts.

Bug 200036089
Bug 1567274

Change-Id: If9cb4db79a19dcb193ba7ad9db7081f4fe1ab433
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/600988

1 files changed, 3 insertions, 5 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h
index 61783c7d..ecae970f 100644
--- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h
@@ -77,14 +77,11 @@ struct fifo_mmu_fault_info_gk20a {
 };
 
 struct fifo_engine_info_gk20a {
-        u32 sw_id;
-        const char *name;
-        u32 dev_info_id;
         u32 engine_id;
         u32 runlist_id;
+        u32 intr_id;
+        u32 reset_id;
         u32 pbdma_id;
-        u32 mmu_fault_id;
-        u32 rc_mask;
         struct fifo_pbdma_exception_info_gk20a pbdma_exception_info;
         struct fifo_engine_exception_info_gk20a engine_exception_info;
         struct fifo_mmu_fault_info_gk20a mmu_fault_info;
@@ -171,4 +168,5 @@ void gk20a_init_fifo(struct gpu_ops *gops);
 void fifo_gk20a_finish_mmu_fault_handling(struct gk20a *g,
                 unsigned long fault_id);
 int gk20a_fifo_wait_engine_idle(struct gk20a *g);
+u32 gk20a_fifo_engine_interrupt_mask(struct gk20a *g);
 #endif /*__GR_GK20A_H__*/