drm: move drm_mem_init to proper place in startup sequence

For TTM this needs to be called later.

Signed-off-by: Dave Airlie <airlied@linux.ie>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/char/drm/drm_drv.c b/drivers/char/drm/drm_drv.c
index fc6e7646cd61..d29d7ed91bdd 100644
--- a/drivers/char/drm/drm_drv.c
+++ b/drivers/char/drm/drm_drv.c
@@ -255,8 +255,6 @@ int drm_init(struct drm_driver *driver)
 
         DRM_DEBUG("\n");
 
-        drm_mem_init();
-
         for (i = 0; driver->pci_driver.id_table[i].vendor != 0; i++) {
                 pid = (struct pci_device_id *)&driver->pci_driver.id_table[i];
 
@@ -383,6 +381,8 @@ static int __init drm_core_init(void)
                 goto err_p3;
         }
 
+        drm_mem_init();
+
         DRM_INFO("Initialized %s %d.%d.%d %s\n",
                  CORE_NAME, CORE_MAJOR, CORE_MINOR, CORE_PATCHLEVEL, CORE_DATE);
         return 0;