diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-05-02 00:52:21 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-05-02 00:52:21 +1000 |
| commit | 5c4c778c0d7d3f4749efade3b1023b8b22c029a9 (patch) | |
| tree | c4b56379521856a4cb17f94503dc45de95bcbb5e | |
| parent | bfbe4ade3253330bd0c625d50fa2e7b5cb62dada (diff) | |
nouveau: restore original NV_PFIFO_CACHES_REASSIGN value in fifo handler
Doesn't fix any issue I've seen, but is a potential issue if a FIFO IRQ
occurs during channel creation/takedown.
| -rw-r--r-- | shared-core/nouveau_irq.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/shared-core/nouveau_irq.c b/shared-core/nouveau_irq.c index 85a70b555..ccbc74205 100644 --- a/shared-core/nouveau_irq.c +++ b/shared-core/nouveau_irq.c @@ -71,8 +71,9 @@ nouveau_fifo_irq_handler(struct drm_device *dev) { struct drm_nouveau_private *dev_priv = dev->dev_private; struct nouveau_engine *engine = &dev_priv->Engine; - uint32_t status; + uint32_t status, reassign; + reassign = NV_READ(NV03_PFIFO_CACHES) & 1; while ((status = NV_READ(NV03_PFIFO_INTR_0))) { uint32_t chid, get; @@ -121,7 +122,7 @@ nouveau_fifo_irq_handler(struct drm_device *dev) NV_WRITE(NV03_PFIFO_INTR_0, status); } - NV_WRITE(NV03_PFIFO_CACHES, 1); + NV_WRITE(NV03_PFIFO_CACHES, reassign); } NV_WRITE(NV03_PMC_INTR_0, NV_PMC_INTR_0_PFIFO_PENDING); |