summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nv50_gpio.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2010-11-03 10:27:27 +1000
committerBen Skeggs <bskeggs@redhat.com>2010-12-03 15:11:34 +1000
commit19b7fc7bf59f4bf02ee738a79baaccae31220df3 (patch)
tree55617722ed8d813156d385d241bbaf21b34f00e6 /drivers/gpu/drm/nouveau/nv50_gpio.c
parent2cbd4c818578ef8f2e486dc77267ead1e503c637 (diff)
downloadop-kernel-dev-19b7fc7bf59f4bf02ee738a79baaccae31220df3.zip
op-kernel-dev-19b7fc7bf59f4bf02ee738a79baaccae31220df3.tar.gz
drm/nv50: use register/unregister functionality for PDISPLAY ISR
Reviewed-by: Francisco Jerez <currojerez@riseup.net> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv50_gpio.c')
-rw-r--r--drivers/gpu/drm/nouveau/nv50_gpio.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_gpio.c b/drivers/gpu/drm/nouveau/nv50_gpio.c
index 302f7eb..87266d1 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"
+#include "nv50_display.h"
+
static void nv50_gpio_isr(struct drm_device *dev);
static int
@@ -109,6 +111,8 @@ nv50_gpio_init(struct drm_device *dev)
nv_wr32(dev, 0xe074, 0xffffffff);
}
+ INIT_WORK(&dev_priv->hpd_work, nv50_display_irq_hotplug_bh);
+ spin_lock_init(&dev_priv->hpd_state.lock);
nouveau_irq_register(dev, 21, nv50_gpio_isr);
return 0;
}
OpenPOWER on IntegriCloud