diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2012-11-22 12:57:32 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2012-11-29 09:58:03 +1000 |
| commit | 874309a5b77f40915369af01cebd18db695d68ae (patch) | |
| tree | ca7ba3c922e628b99c685c4211662a79114f6668 /drivers/gpu/drm/nouveau/core/engine/mpeg | |
| parent | e0cdd1e5451efb46515804550aa7eaa9672b0cf0 (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/mpeg')
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/engine/mpeg/nv50.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/core/engine/mpeg/nv50.c b/drivers/gpu/drm/nouveau/core/engine/mpeg/nv50.c index 8678a9996d5..bc7d12b30fc 100644 --- a/drivers/gpu/drm/nouveau/core/engine/mpeg/nv50.c +++ b/drivers/gpu/drm/nouveau/core/engine/mpeg/nv50.c @@ -157,7 +157,6 @@ nv50_mpeg_intr(struct nouveau_subdev *subdev) nv_wr32(priv, 0x00b100, stat); nv_wr32(priv, 0x00b230, 0x00000001); - nv50_fb_trap(nouveau_fb(priv), 1); } static void |