diff options
| author | Francisco Jerez <currojerez@riseup.net> | 2010-08-04 04:41:55 +0200 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-08-06 00:34:50 +0200 |
| commit | 308dcebac7cb9e6dcf8972a178c535b795952931 (patch) | |
| tree | c3a489b9c88631635f94b56a30a6c32002355c3f /drivers/gpu/drm/nouveau | |
| parent | drm/nouveau: Fix the INIT_CONFIGURE_PREINIT BIOS opcode. (diff) | |
| download | linux-308dcebac7cb9e6dcf8972a178c535b795952931.tar.xz linux-308dcebac7cb9e6dcf8972a178c535b795952931.zip | |
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>
Diffstat (limited to 'drivers/gpu/drm/nouveau')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) { |