drm/nv04-nv40: register vblank isr

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

diff --git a/drivers/gpu/drm/nouveau/nouveau_irq.c b/drivers/gpu/drm/nouveau/nouveau_irq.c
index e8a3c400f7416466a4ecc1cbc43eaf5126b1cb36..6c30669ac0b6e6a877789adca031381b7f8af0b6 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_irq.c
+++ b/drivers/gpu/drm/nouveau/nouveau_irq.c
@@ -1131,20 +1131,6 @@ nv50_pgraph_irq_handler(struct drm_device *dev)
                nv_wr32(dev, 0x400824, nv_rd32(dev, 0x400824) & ~(1 << 31));
 }
 
-static void
-nouveau_crtc_irq_handler(struct drm_device *dev, int crtc)
-{
-       if (crtc & 1) {
-               nv_wr32(dev, NV_CRTC0_INTSTAT, NV_CRTC_INTR_VBLANK);
-               drm_handle_vblank(dev, 0);
-       }
-
-       if (crtc & 2) {
-               nv_wr32(dev, NV_CRTC1_INTSTAT, NV_CRTC_INTR_VBLANK);
-               drm_handle_vblank(dev, 1);
-       }
-}
-
 irqreturn_t
 nouveau_irq_handler(DRM_IRQ_ARGS)
 {
@@ -1174,11 +1160,6 @@ nouveau_irq_handler(DRM_IRQ_ARGS)
                status &= ~NV_PMC_INTR_0_PGRAPH_PENDING;
        }
 
-       if (status & NV_PMC_INTR_0_CRTCn_PENDING) {
-               nouveau_crtc_irq_handler(dev, (status>>24)&3);
-               status &= ~NV_PMC_INTR_0_CRTCn_PENDING;
-       }
-
        for (i = 0; i < 32 && status; i++) {
                if (!(status & (1 << i)) || !dev_priv->irq_handler[i])
                        continue;

diff --git a/drivers/gpu/drm/nouveau/nv04_display.c b/drivers/gpu/drm/nouveau/nv04_display.c
index 9e28cf772e3cd482af0c1d048634470d0bdf3b2d..0978a5b326dc24fcaf84e24b7b02ca9e1cebeaea 100644 (file)
--- a/drivers/gpu/drm/nouveau/nv04_display.c
+++ b/drivers/gpu/drm/nouveau/nv04_display.c
@@ -32,6 +32,9 @@
 #include "nouveau_encoder.h"
 #include "nouveau_connector.h"
 
+static void nv04_vblank_crtc0_isr(struct drm_device *);
+static void nv04_vblank_crtc1_isr(struct drm_device *);
+
 static void
 nv04_display_store_initial_head_owner(struct drm_device *dev)
 {
@@ -197,6 +200,8 @@ nv04_display_create(struct drm_device *dev)
                func->save(encoder);
        }
 
+       nouveau_irq_register(dev, 24, nv04_vblank_crtc0_isr);
+       nouveau_irq_register(dev, 25, nv04_vblank_crtc1_isr);
        return 0;
 }
 
@@ -258,3 +263,16 @@ nv04_display_init(struct drm_device *dev)
        return 0;
 }
 
+static void
+nv04_vblank_crtc0_isr(struct drm_device *dev)
+{
+       nv_wr32(dev, NV_CRTC0_INTSTAT, NV_CRTC_INTR_VBLANK);
+       drm_handle_vblank(dev, 0);
+}
+
+static void
+nv04_vblank_crtc1_isr(struct drm_device *dev)
+{
+       nv_wr32(dev, NV_CRTC1_INTSTAT, NV_CRTC_INTR_VBLANK);
+       drm_handle_vblank(dev, 1);
+}