diff options
| author | Ben Skeggs | 2012-11-22 03:57:32 +0100 |
|---|---|---|
| committer | Ben Skeggs | 2012-11-29 00:58:03 +0100 |
| commit | 874309a5b77f40915369af01cebd18db695d68ae (patch) | |
| tree | ca7ba3c922e628b99c685c4211662a79114f6668 /drivers/gpu/drm/nouveau/core/engine/fifo | |
| parent | drm/nouveau/mc: allow calling of multiple handlers for a give intr bit (diff) | |
| download | kernel-qcow2-linux-874309a5b77f40915369af01cebd18db695d68ae.tar.gz kernel-qcow2-linux-874309a5b77f40915369af01cebd18db695d68ae.tar.xz kernel-qcow2-linux-874309a5b77f40915369af01cebd18db695d68ae.zip | |
drm/nv50/fb: implement trap handler as subdev interrupt handler
nv50_fb_trap() will now be called automagically by the mc intr handler,
rather than each engine's handler having to check for traps manually.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/core/engine/fifo')
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/engine/fifo/nv04.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/nv04.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nv04.c index ea76e3e8c9c2..1147aec96a68 100644 --- a/drivers/gpu/drm/nouveau/core/engine/fifo/nv04.c +++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nv04.c @@ -525,7 +525,6 @@ nv04_fifo_intr(struct nouveau_subdev *subdev) if (device->card_type == NV_50) { if (status & 0x00000010) { - nv50_fb_trap(nouveau_fb(priv), 1); status &= ~0x00000010; nv_wr32(priv, 0x002100, 0x00000010); } |