drm/nv50: add function to control GPIO IRQ reporting

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
index 9d53f3d1487d452ba1e620628c6b3cfbae33b90f..6b24186a103f2c15ce6f1a9fe3eadc2fccadb436 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -1140,6 +1140,7 @@ int nv17_gpio_set(struct drm_device *dev, enum dcb_gpio_tag tag, int state);
 /* nv50_gpio.c */
 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);
 
 /* nv50_calc. */
 int nv50_calc_pll(struct drm_device *, struct pll_lims *, int clk,

diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
index c19ed8c8e3b5d1757951ac6f0719e39c7d753a3b..fbd91c251ee95ee8e645c1e7c9b325803f3dba33 100644 (file)
--- a/drivers/gpu/drm/nouveau/nv50_display.c
+++ b/drivers/gpu/drm/nouveau/nv50_display.c
@@ -184,7 +184,7 @@ nv50_display_init(struct drm_device *dev)
        struct nouveau_timer_engine *ptimer = &dev_priv->engine.timer;
        struct nouveau_channel *evo = dev_priv->evo;
        struct drm_connector *connector;
-       uint32_t val, ram_amount, hpd_en[2];
+       uint32_t val, ram_amount;
        uint64_t start;
        int ret, i;
 
@@ -365,26 +365,10 @@ nv50_display_init(struct drm_device *dev)
                                             NV50_PDISPLAY_INTR_EN_CLK_UNK40));
 
        /* enable hotplug interrupts */
-       hpd_en[0] = hpd_en[1] = 0;
        list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
                struct nouveau_connector *conn = nouveau_connector(connector);
-               struct dcb_gpio_entry *gpio;
-
-               if (conn->dcb->gpio_tag == 0xff)
-                       continue;
-
-               gpio = nouveau_bios_gpio_entry(dev, conn->dcb->gpio_tag);
-               if (!gpio)
-                       continue;
 
-               hpd_en[gpio->line >> 4] |= (0x00010001 << (gpio->line & 0xf));
-       }
-
-       nv_wr32(dev, 0xe054, 0xffffffff);
-       nv_wr32(dev, 0xe050, hpd_en[0]);
-       if (dev_priv->chipset >= 0x90) {
-               nv_wr32(dev, 0xe074, 0xffffffff);
-               nv_wr32(dev, 0xe070, hpd_en[1]);
+               nv50_gpio_irq_enable(dev, conn->dcb->gpio_tag, true);
        }
 
        return 0;

diff --git a/drivers/gpu/drm/nouveau/nv50_gpio.c b/drivers/gpu/drm/nouveau/nv50_gpio.c
index bb47ad737267a07ecfdc1071a6ebf7f2fdb6f9ec..88715c5003c1e80fcb579761eb0ce3f2d804877e 100644 (file)
--- a/drivers/gpu/drm/nouveau/nv50_gpio.c
+++ b/drivers/gpu/drm/nouveau/nv50_gpio.c
@@ -74,3 +74,22 @@ nv50_gpio_set(struct drm_device *dev, enum dcb_gpio_tag tag, int state)
        nv_wr32(dev, r, v);
        return 0;
 }
+
+void
+nv50_gpio_irq_enable(struct drm_device *dev, enum dcb_gpio_tag tag, bool on)
+{
+       struct dcb_gpio_entry *gpio;
+       u32 reg, mask;
+
+       gpio = nouveau_bios_gpio_entry(dev, tag);
+       if (!gpio) {
+               NV_ERROR(dev, "gpio tag 0x%02x not found\n", tag);
+               return;
+       }
+
+       reg  = gpio->line < 16 ? 0xe050 : 0xe070;
+       mask = 0x00010001 << (gpio->line & 0xf);
+
+       nv_wr32(dev, reg + 4, mask);
+       nv_mask(dev, reg + 0, mask, on ? mask : 0);
+}

diff --git a/drivers/gpu/drm/nouveau/nv50_mc.c b/drivers/gpu/drm/nouveau/nv50_mc.c
index e0a9c3faa202f71fe8d4b6e41cc8c8d0d7c685ce..f680e8e121b10d2d7c2ff511bb8fc65c4e37d895 100644 (file)
--- a/drivers/gpu/drm/nouveau/nv50_mc.c
+++ b/drivers/gpu/drm/nouveau/nv50_mc.c
@@ -31,7 +31,20 @@
 int
 nv50_mc_init(struct drm_device *dev)
 {
+       struct drm_nouveau_private *dev_priv = dev->dev_private;
+
        nv_wr32(dev, NV03_PMC_ENABLE, 0xFFFFFFFF);
+
+       /* disable, and ack any pending gpio interrupts
+        * XXX doesn't technically belong here, but it'll do for the moment
+        */
+       nv_wr32(dev, 0xe050, 0x00000000);
+       nv_wr32(dev, 0xe054, 0xffffffff);
+       if (dev_priv->chipset >= 0x90) {
+               nv_wr32(dev, 0xe070, 0x00000000);
+               nv_wr32(dev, 0xe074, 0xffffffff);
+       }
+
        return 0;
 }