aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/msm/msm_drv.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index 72f2b962efd4..cc6485ef2949 100644
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -285,10 +285,6 @@ static int msm_load(struct drm_device *dev, unsigned long flags)
285 285
286 drm_mode_config_init(dev); 286 drm_mode_config_init(dev);
287 287
288 ret = msm_init_vram(dev);
289 if (ret)
290 goto fail;
291
292 platform_set_drvdata(pdev, dev); 288 platform_set_drvdata(pdev, dev);
293 289
294 /* Bind all our sub-components: */ 290 /* Bind all our sub-components: */
@@ -296,6 +292,10 @@ static int msm_load(struct drm_device *dev, unsigned long flags)
296 if (ret) 292 if (ret)
297 return ret; 293 return ret;
298 294
295 ret = msm_init_vram(dev);
296 if (ret)
297 goto fail;
298
299 switch (get_mdp_ver(pdev)) { 299 switch (get_mdp_ver(pdev)) {
300 case 4: 300 case 4:
301 kms = mdp4_kms_init(dev); 301 kms = mdp4_kms_init(dev);