summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2014-08-27 17:53:31 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2014-10-17 17:59:06 +0200
commit0544e38d5ae90676624350468dea88c93eaeacbf (patch)
tree6e9bc1962a75053c01558ab3cfe179c910c98611 /drivers
parentLinux 3.17 (diff)
downloadlinux-0544e38d5ae90676624350468dea88c93eaeacbf.tar.xz
linux-0544e38d5ae90676624350468dea88c93eaeacbf.zip
drm/armada: add IRQ support back
Add IRQ support back so that vblank ioctls work again. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/armada/armada_drv.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/armada/armada_drv.c b/drivers/gpu/drm/armada/armada_drv.c
index e2d5792b140f..91107381aa00 100644
--- a/drivers/gpu/drm/armada/armada_drv.c
+++ b/drivers/gpu/drm/armada/armada_drv.c
@@ -190,6 +190,7 @@ static int armada_drm_load(struct drm_device *dev, unsigned long flags)
if (ret)
goto err_comp;
+ dev->irq_enabled = true;
dev->vblank_disable_allowed = 1;
ret = armada_fbdev_init(dev);
@@ -330,7 +331,7 @@ static struct drm_driver armada_drm_driver = {
.desc = "Armada SoC DRM",
.date = "20120730",
.driver_features = DRIVER_GEM | DRIVER_MODESET |
- DRIVER_PRIME,
+ DRIVER_HAVE_IRQ | DRIVER_PRIME,
.ioctls = armada_ioctls,
.fops = &armada_drm_fops,
};