drm/nouveau/pmu: prevent falcon from acking interrupts routed to the host

[linux-2.6-block.git] / drivers / gpu / drm / nouveau / nvkm / subdev / pmu / fuc / kernel.fuc

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/kernel.fuc b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/kernel.fuc
index 5cf5be63cbeff3ea4db031c606979d32fe413c89..ad35fa57be948dd1d084651971d2b23bb640f806 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/kernel.fuc
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/kernel.fuc
@@ -225,17 +225,11 @@ intr:
                nv_iowr(NV_PPWR_SUBINTR, $r9)
 
        intr_skip_subintr:
-       and $r9 $r8 NV_PPWR_INTR_PAUSE
-       bra z #intr_skip_pause
-               and $r10 0xffbf
-
-       intr_skip_pause:
-       and $r9 $r8 NV_PPWR_INTR_USER0
-       bra z #intr_skip_user0
-               and $r10 0xffbf
-
-       intr_skip_user0:
+       mov $r9 (NV_PPWR_INTR_USER0 | NV_PPWR_INTR_USER1 | NV_PPWR_INTR_PAUSE)
+       not b32 $r9
+       and $r8 $r9
        nv_iowr(NV_PPWR_INTR_ACK, $r8)
+
        pop $r8
        mov $flags $r8
        pop $r15