From: Francisco Jerez <currojerez@riseup.net>
Date: Wed, 4 Aug 2010 02:41:55 +0000 (+0200)
Subject: drm/nouveau: Ack the context switch interrupt before switching contexts.
X-Git-Tag: MMI-PSA29.97-13-9~22407^2~4^2~42
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=308dcebac7cb9e6dcf8972a178c535b795952931;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

drm/nouveau: Ack the context switch interrupt before switching contexts.

Leaving the IRQ unack'ed while switching contexts makes the switch
fail randomly on some nv1x.

Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/nouveau_irq.c b/drivers/gpu/drm/nouveau/nouveau_irq.c
index 53360f156063..0a4a61770df0 100644
--- a/drivers/gpu/drm/nouveau/nouveau_irq.c
+++ b/drivers/gpu/drm/nouveau/nouveau_irq.c
@@ -586,11 +586,11 @@ nouveau_pgraph_irq_handler(struct drm_device *dev)
 		}
 
 		if (status & NV_PGRAPH_INTR_CONTEXT_SWITCH) {
-			nouveau_pgraph_intr_context_switch(dev);
-
 			status &= ~NV_PGRAPH_INTR_CONTEXT_SWITCH;
 			nv_wr32(dev, NV03_PGRAPH_INTR,
 				 NV_PGRAPH_INTR_CONTEXT_SWITCH);
+
+			nouveau_pgraph_intr_context_switch(dev);
 		}
 
 		if (status) {