aboutsummaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/nouveau/core/engine/copy
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2012-11-22 12:57:32 +1000
committerBen Skeggs <bskeggs@redhat.com>2012-11-29 09:58:03 +1000
commit874309a5b77f40915369af01cebd18db695d68ae (patch)
treeca7ba3c922e628b99c685c4211662a79114f6668 /drivers/gpu/drm/nouveau/core/engine/copy
parente0cdd1e5451efb46515804550aa7eaa9672b0cf0 (diff)
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/copy')
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/copy/nva3.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/core/engine/copy/nva3.c b/drivers/gpu/drm/nouveau/core/engine/copy/nva3.c
index 1df010cadff..c28e6fbb556 100644
--- a/drivers/gpu/drm/nouveau/core/engine/copy/nva3.c
+++ b/drivers/gpu/drm/nouveau/core/engine/copy/nva3.c
@@ -133,7 +133,6 @@ nva3_copy_intr(struct nouveau_subdev *subdev)
nv_wr32(priv, 0x104004, stat);
}
- nv50_fb_trap(nouveau_fb(priv), 1);
nouveau_engctx_put(engctx);
}