diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2012-11-22 02:57:32 (GMT) |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2012-11-28 23:58:03 (GMT) |
| commit | 874309a5b77f40915369af01cebd18db695d68ae (patch) | |
| tree | ca7ba3c922e628b99c685c4211662a79114f6668 /drivers/gpu/drm/nouveau/core/subdev/mc | |
| parent | e0cdd1e5451efb46515804550aa7eaa9672b0cf0 (diff) | |
| download | linux-fsl-qoriq-874309a5b77f40915369af01cebd18db695d68ae.tar.xz | |
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/subdev/mc')
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/subdev/mc/nv50.c | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/subdev/mc/nv98.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/core/subdev/mc/nv50.c b/drivers/gpu/drm/nouveau/core/subdev/mc/nv50.c index cedf33b..8d759f8 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/mc/nv50.c +++ b/drivers/gpu/drm/nouveau/core/subdev/mc/nv50.c @@ -39,6 +39,7 @@ nv50_mc_intr[] = { { 0x00200000, NVDEV_SUBDEV_GPIO }, { 0x04000000, NVDEV_ENGINE_DISP }, { 0x80000000, NVDEV_ENGINE_SW }, + { 0x0000d101, NVDEV_SUBDEV_FB }, {}, }; diff --git a/drivers/gpu/drm/nouveau/core/subdev/mc/nv98.c b/drivers/gpu/drm/nouveau/core/subdev/mc/nv98.c index a001e4c4..ceb5c83 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/mc/nv98.c +++ b/drivers/gpu/drm/nouveau/core/subdev/mc/nv98.c @@ -40,6 +40,7 @@ nv98_mc_intr[] = { { 0x00400000, NVDEV_ENGINE_COPY0 }, /* NVA3- */ { 0x04000000, NVDEV_ENGINE_DISP }, { 0x80000000, NVDEV_ENGINE_SW }, + { 0x0040d101, NVDEV_SUBDEV_FB }, {}, }; |