drm/nv50: use register/unregister functionality for PDISPLAY ISR

Reviewed-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

1 files changed, 1 insertions, 15 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_irq.c b/drivers/gpu/drm/nouveau/nouveau_irq.c
index 061bae33b6e0..2f546884f2ed 100644
--- a/drivers/gpu/drm/nouveau/nouveau_irq.c
+++ b/drivers/gpu/drm/nouveau/nouveau_irq.c
@@ -38,10 +38,6 @@
 #include "nouveau_ramht.h"
 #include "nouveau_util.h"
 
-/* needed for hotplug irq */
-#include "nouveau_connector.h"
-#include "nv50_display.h"
-
 void
 nouveau_irq_preinstall(struct drm_device *dev)
 {
@@ -50,12 +46,7 @@ nouveau_irq_preinstall(struct drm_device *dev)
         /* Master disable */
         nv_wr32(dev, NV03_PMC_INTR_EN_0, 0);
 
-        if (dev_priv->card_type >= NV_50) {
-                INIT_WORK(&dev_priv->irq_work, nv50_display_irq_handler_bh);
-                INIT_WORK(&dev_priv->hpd_work, nv50_display_irq_hotplug_bh);
-                spin_lock_init(&dev_priv->hpd_state.lock);
-                INIT_LIST_HEAD(&dev_priv->vbl_waiting);
-        }
+        INIT_LIST_HEAD(&dev_priv->vbl_waiting);
 }
 
 int
@@ -1238,11 +1229,6 @@ nouveau_irq_handler(DRM_IRQ_ARGS)
                 status &= ~NV_PMC_INTR_0_CRTCn_PENDING;
         }
 
-        if (status & NV_PMC_INTR_0_NV50_DISPLAY_PENDING) {
-                nv50_display_irq_handler(dev);
-                status &= ~NV_PMC_INTR_0_NV50_DISPLAY_PENDING;
-        }
-
         for (i = 0; i < 32 && status; i++) {
                 if (!(status & (1 << i)) || !dev_priv->irq_handler[i])
                         continue;