diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2012-11-02 11:33:27 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2012-11-29 09:57:44 +1000 |
| commit | 14464b8cd643467cb97335eb75ea676260dd0ad8 (patch) | |
| tree | 0e3afde552b1aad18941047bd2b8c77c084f8e2c /drivers/gpu/drm/nouveau/nouveau_irq.c | |
| parent | 206c38a9f1905d3054778f26289591376829d5ad (diff) | |
| download | linux-stable-14464b8cd643467cb97335eb75ea676260dd0ad8.tar.gz linux-stable-14464b8cd643467cb97335eb75ea676260dd0ad8.tar.bz2 linux-stable-14464b8cd643467cb97335eb75ea676260dd0ad8.zip | |
drm/nvd0/disp: move remaining interrupt handling to core
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_irq.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_irq.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_irq.c b/drivers/gpu/drm/nouveau/nouveau_irq.c index 1d8cb506a28a..03cdc077c4bc 100644 --- a/drivers/gpu/drm/nouveau/nouveau_irq.c +++ b/drivers/gpu/drm/nouveau/nouveau_irq.c @@ -61,15 +61,11 @@ nouveau_irq_handler(DRM_IRQ_ARGS) nv_subdev(pmc)->intr(nv_subdev(pmc)); - if (dev->mode_config.num_crtc) { - if (device->card_type >= NV_D0) { - if (nv_rd32(device, 0x000100) & 0x04000000) - nvd0_display_intr(dev); - } else - if (device->card_type >= NV_50) { - if (nv_rd32(device, 0x000100) & 0x04000000) - nv50_display_intr(dev); - } + if (dev->mode_config.num_crtc && + device->card_type <= NV_C0 && + device->card_type >= NV_50) { + if (nv_rd32(device, 0x000100) & 0x04000000) + nv50_display_intr(dev); } return IRQ_HANDLED; |