drm_mem_init should be done at core load, not driver init

diff --git a/linux-core/drm_drv.c b/linux-core/drm_drv.c
index ac551e4..5a39e34 100644 (file)
--- a/linux-core/drm_drv.c
+++ b/linux-core/drm_drv.c
@@ -314,8 +314,6 @@ int drm_init(struct drm_driver *driver,
 
        DRM_DEBUG("\n");
 
-       drm_mem_init();
-
        for (i = 0; (pciidlist[i].vendor != 0) && !drm_fb_loaded; i++) {
                pid = &pciidlist[i];
 
@@ -518,6 +516,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);