From 1252890ff1d62544a250560f0c2985454bf888b5 Mon Sep 17 00:00:00 2001 From: Jon Smirl Date: Thu, 9 Jun 2005 13:22:12 +0000 Subject: drm_mem_init should be done at core load, not driver init --- linux-core/drm_drv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'linux-core/drm_drv.c') 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); -- cgit v1.2.3