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 15:21:30 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2014-07-03 16:24:46 +0100
commit3ecea269959afaae50b001deb294cfb9539dbea3 (patch)
treeb42981b9f3226d2fa76d20482436da40b0e8e5b2 /drivers/gpu/drm/armada/armada_drv.c
parentd016540722bb412ffa8376a9db0de757ce915bfb (diff)
drm/armada: move variant initialisation to CRTC init
Move the variant initialisation entirely to the CRTC init function - the variant support is really about the CRTC properties than the whole system, and we want to treat each CRTC individually when we support DT. 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, 0 insertions, 4 deletions
diff --git a/drivers/gpu/drm/armada/armada_drv.c b/drivers/gpu/drm/armada/armada_drv.c
index add8b101fa9e..4939a86a2afc 100644
--- a/drivers/gpu/drm/armada/armada_drv.c
+++ b/drivers/gpu/drm/armada/armada_drv.c
@@ -130,10 +130,6 @@ static int armada_drm_load(struct drm_device *dev, unsigned long flags)
priv->variant = (struct armada_variant *)id->driver_data;
- ret = priv->variant->init(priv, dev->dev);
- if (ret)
- return ret;
-
INIT_WORK(&priv->fb_unref_work, armada_drm_unref_work);
INIT_KFIFO(priv->fb_unref);