aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2014-08-27 11:53:31 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2014-10-17 11:59:06 -0400
commit0544e38d5ae90676624350468dea88c93eaeacbf (patch)
tree6e9bc1962a75053c01558ab3cfe179c910c98611
parentbfe01a5ba2490f299e1d2d5508cbbbadd897bbe9 (diff)
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>
-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)
190 if (ret) 190 if (ret)
191 goto err_comp; 191 goto err_comp;
192 192
193 dev->irq_enabled = true;
193 dev->vblank_disable_allowed = 1; 194 dev->vblank_disable_allowed = 1;
194 195
195 ret = armada_fbdev_init(dev); 196 ret = armada_fbdev_init(dev);
@@ -330,7 +331,7 @@ static struct drm_driver armada_drm_driver = {
330 .desc = "Armada SoC DRM", 331 .desc = "Armada SoC DRM",
331 .date = "20120730", 332 .date = "20120730",
332 .driver_features = DRIVER_GEM | DRIVER_MODESET | 333 .driver_features = DRIVER_GEM | DRIVER_MODESET |
333 DRIVER_PRIME, 334 DRIVER_HAVE_IRQ | DRIVER_PRIME,
334 .ioctls = armada_ioctls, 335 .ioctls = armada_ioctls,
335 .fops = &armada_drm_fops, 336 .fops = &armada_drm_fops,
336}; 337};