drm/nv50: move GPIO ISR to nv50_gpio.c

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

5 files changed, 40 insertions, 24 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
index 52dc97d87ebd..c0fad126eaa4 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -1359,6 +1359,7 @@ int nv10_gpio_set(struct drm_device *dev, enum dcb_gpio_tag tag, int state);
 
 /* nv50_gpio.c */
 int nv50_gpio_init(struct drm_device *dev);
+void nv50_gpio_fini(struct drm_device *dev);
 int nv50_gpio_get(struct drm_device *dev, enum dcb_gpio_tag tag);
 int nv50_gpio_set(struct drm_device *dev, enum dcb_gpio_tag tag, int state);
 void nv50_gpio_irq_enable(struct drm_device *, enum dcb_gpio_tag, bool on);
diff --git a/drivers/gpu/drm/nouveau/nouveau_irq.c b/drivers/gpu/drm/nouveau/nouveau_irq.c
index bdaf8ae44476..061bae33b6e0 100644
--- a/drivers/gpu/drm/nouveau/nouveau_irq.c
+++ b/drivers/gpu/drm/nouveau/nouveau_irq.c
@@ -1238,11 +1238,9 @@ nouveau_irq_handler(DRM_IRQ_ARGS)
                 status &= ~NV_PMC_INTR_0_CRTCn_PENDING;
         }
 
-        if (status & (NV_PMC_INTR_0_NV50_DISPLAY_PENDING |
-                      NV_PMC_INTR_0_NV50_I2C_PENDING)) {
+        if (status & NV_PMC_INTR_0_NV50_DISPLAY_PENDING) {
                 nv50_display_irq_handler(dev);
-                status &= ~(NV_PMC_INTR_0_NV50_DISPLAY_PENDING |
-                            NV_PMC_INTR_0_NV50_I2C_PENDING);
+                status &= ~NV_PMC_INTR_0_NV50_DISPLAY_PENDING;
         }
 
         for (i = 0; i < 32 && status; i++) {
diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
index 1a7a50ccb7c8..84bff459491e 100644
--- a/drivers/gpu/drm/nouveau/nouveau_state.c
+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
@@ -393,7 +393,7 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)
                 engine->display.init            = nv50_display_init;
                 engine->display.destroy         = nv50_display_destroy;
                 engine->gpio.init               = nv50_gpio_init;
-                engine->gpio.takedown           = nouveau_stub_takedown;
+                engine->gpio.takedown           = nv50_gpio_fini;
                 engine->gpio.get                = nv50_gpio_get;
                 engine->gpio.set                = nv50_gpio_set;
                 engine->gpio.irq_enable         = nv50_gpio_irq_enable;
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
index 41b212801870..42cb5b5c73c0 100644
--- a/drivers/gpu/drm/nouveau/nv50_display.c
+++ b/drivers/gpu/drm/nouveau/nv50_display.c
@@ -869,25 +869,6 @@ nv50_display_irq_handler(struct drm_device *dev)
         struct drm_nouveau_private *dev_priv = dev->dev_private;
         uint32_t delayed = 0;
 
-        if (nv_rd32(dev, NV50_PMC_INTR_0) & NV50_PMC_INTR_0_HOTPLUG) {
-                uint32_t hpd0_bits, hpd1_bits = 0;
-
-                hpd0_bits = nv_rd32(dev, 0xe054);
-                nv_wr32(dev, 0xe054, hpd0_bits);
-
-                if (dev_priv->chipset >= 0x90) {
-                        hpd1_bits = nv_rd32(dev, 0xe074);
-                        nv_wr32(dev, 0xe074, hpd1_bits);
-                }
-
-                spin_lock(&dev_priv->hpd_state.lock);
-                dev_priv->hpd_state.hpd0_bits |= hpd0_bits;
-                dev_priv->hpd_state.hpd1_bits |= hpd1_bits;
-                spin_unlock(&dev_priv->hpd_state.lock);
-
-                queue_work(dev_priv->wq, &dev_priv->hpd_work);
-        }
-
         while (nv_rd32(dev, NV50_PMC_INTR_0) & NV50_PMC_INTR_0_DISPLAY) {
                 uint32_t intr0 = nv_rd32(dev, NV50_PDISPLAY_INTR_0);
                 uint32_t intr1 = nv_rd32(dev, NV50_PDISPLAY_INTR_1);
diff --git a/drivers/gpu/drm/nouveau/nv50_gpio.c b/drivers/gpu/drm/nouveau/nv50_gpio.c
index b2fab2bf3d61..302f7ebe5b6f 100644
--- a/drivers/gpu/drm/nouveau/nv50_gpio.c
+++ b/drivers/gpu/drm/nouveau/nv50_gpio.c
@@ -26,6 +26,8 @@
 #include "nouveau_drv.h"
 #include "nouveau_hw.h"
 
+static void nv50_gpio_isr(struct drm_device *dev);
+
 static int
 nv50_gpio_location(struct dcb_gpio_entry *gpio, uint32_t *reg, uint32_t *shift)
 {
@@ -107,5 +109,39 @@ nv50_gpio_init(struct drm_device *dev)
                 nv_wr32(dev, 0xe074, 0xffffffff);
         }
 
+        nouveau_irq_register(dev, 21, nv50_gpio_isr);
         return 0;
 }
+
+void
+nv50_gpio_fini(struct drm_device *dev)
+{
+        struct drm_nouveau_private *dev_priv = dev->dev_private;
+
+        nv_wr32(dev, 0xe050, 0x00000000);
+        if (dev_priv->chipset >= 0x90)
+                nv_wr32(dev, 0xe070, 0x00000000);
+        nouveau_irq_unregister(dev, 21);
+}
+
+static void
+nv50_gpio_isr(struct drm_device *dev)
+{
+        struct drm_nouveau_private *dev_priv = dev->dev_private;
+        uint32_t hpd0_bits, hpd1_bits = 0;
+
+        hpd0_bits = nv_rd32(dev, 0xe054);
+        nv_wr32(dev, 0xe054, hpd0_bits);
+
+        if (dev_priv->chipset >= 0x90) {
+                hpd1_bits = nv_rd32(dev, 0xe074);
+                nv_wr32(dev, 0xe074, hpd1_bits);
+        }
+
+        spin_lock(&dev_priv->hpd_state.lock);
+        dev_priv->hpd_state.hpd0_bits |= hpd0_bits;
+        dev_priv->hpd_state.hpd1_bits |= hpd1_bits;
+        spin_unlock(&dev_priv->hpd_state.lock);
+
+        queue_work(dev_priv->wq, &dev_priv->hpd_work);
+}