summaryrefslogtreecommitdiff
path: root/linux-core
diff options
context:
space:
mode:
authorJon Smirl <jonsmirl@yahoo.com>2005-06-09 13:22:12 +0000
committerJon Smirl <jonsmirl@yahoo.com>2005-06-09 13:22:12 +0000
commit1252890ff1d62544a250560f0c2985454bf888b5 (patch)
tree96c471d5d1cbcc44693e87e01f566b389b342b65 /linux-core
parent9f2f010763170890c69e1d2f9dd1f550db0400b1 (diff)
drm_mem_init should be done at core load, not driver init
Diffstat (limited to 'linux-core')
-rw-r--r--linux-core/drm_drv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux-core/drm_drv.c b/linux-core/drm_drv.c
index ac551e40..5a39e34e 100644
--- 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);