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, 11 insertions, 12 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index 1bd1c898..91cd5834 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -757,11 +757,6 @@ static int gk20a_pm_finalize_poweron(struct device *dev)
         if (err)
                 goto done;
 
-        enable_irq(g->irq_stall);
-        enable_irq(g->irq_nonstall);
-
-        g->ops.mc.intr_enable(g);
-
         if (!tegra_platform_is_silicon())
                 gk20a_writel(g, bus_intr_en_0_r(), 0x0);
         else
@@ -814,6 +809,14 @@ static int gk20a_pm_finalize_poweron(struct device *dev)
                 goto done;
         }
 
+        err = gk20a_init_fifo_support(g);
+        if (err) {
+                gk20a_err(dev, "failed to init gk20a fifo");
+                goto done;
+        }
+
+        g->ops.mc.intr_enable(g);
+
         err = gk20a_enable_gr_hw(g);
         if (err) {
                 gk20a_err(dev, "failed to enable gr");
@@ -833,12 +836,6 @@ static int gk20a_pm_finalize_poweron(struct device *dev)
                 goto done;
         }
 
-        err = gk20a_init_fifo_support(g);
-        if (err) {
-                gk20a_err(dev, "failed to init gk20a fifo");
-                goto done;
-        }
-
         err = gk20a_init_gr_support(g);
         if (err) {
                 gk20a_err(dev, "failed to init gk20a gr");
@@ -857,7 +854,6 @@ static int gk20a_pm_finalize_poweron(struct device *dev)
                 goto done;
         }
 
-
         gk20a_channel_resume(g);
         set_user_nice(current, nice_value);
 
@@ -868,6 +864,9 @@ static int gk20a_pm_finalize_poweron(struct device *dev)
         if (platform->has_cde)
                 gk20a_init_cde_support(g);
 
+        enable_irq(g->irq_stall);
+        enable_irq(g->irq_nonstall);
+
 #ifdef CONFIG_INPUT_CFBOOST
         if (!g->boost_added) {
                 gk20a_dbg_info("add touch boost");