summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/armada/armada_drv.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2014-04-22 10:02:23 (GMT)
committerRussell King <rmk+kernel@arm.linux.org.uk>2014-07-03 15:24:45 (GMT)
commitd016540722bb412ffa8376a9db0de757ce915bfb (patch)
tree36aefe4ee59e489c84042f817260d90173bd09c2 /drivers/gpu/drm/armada/armada_drv.c
parente5d9ddfbb79667fb4b16db07c3282a2304fbf3ff (diff)
downloadlinux-d016540722bb412ffa8376a9db0de757ce915bfb.tar.xz
drm/armada: use number of CRTCs registered
Use the number of CRTCs registered to size the vblank arrays rather than our own count. Number CRTCs using this as well. This permits us to register CRTCs as components in the near future rather than as part of a single device. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/gpu/drm/armada/armada_drv.c')
-rw-r--r--drivers/gpu/drm/armada/armada_drv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/armada/armada_drv.c b/drivers/gpu/drm/armada/armada_drv.c
index 58884d8..add8b10 100644
--- a/drivers/gpu/drm/armada/armada_drv.c
+++ b/drivers/gpu/drm/armada/armada_drv.c
@@ -164,7 +164,7 @@ static int armada_drm_load(struct drm_device *dev, unsigned long flags)
if (irq < 0)
goto err_kms;
- ret = armada_drm_crtc_create(dev, n, res[n], irq);
+ ret = armada_drm_crtc_create(dev, res[n], irq);
if (ret)
goto err_kms;
}
@@ -175,7 +175,7 @@ static int armada_drm_load(struct drm_device *dev, unsigned long flags)
goto err_kms;
#endif
- ret = drm_vblank_init(dev, n);
+ ret = drm_vblank_init(dev, dev->mode_config.num_crtc);
if (ret)
goto err_kms;