aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2007-11-22 03:43:46 -0500
committerDave Airlie <airlied@redhat.com>2008-02-07 00:09:39 -0500
commit3260f9fdfee9d5b4135f40943dc0bd0733b7394e (patch)
treec1b7b387d993d39dfd68e95d32deb6b6a142406e
parent2716a02f607c964ccaa6fa7266abd3acd73d9033 (diff)
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>
-rw-r--r--drivers/char/drm/drm_drv.c4
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)
255 255
256 DRM_DEBUG("\n"); 256 DRM_DEBUG("\n");
257 257
258 drm_mem_init();
259
260 for (i = 0; driver->pci_driver.id_table[i].vendor != 0; i++) { 258 for (i = 0; driver->pci_driver.id_table[i].vendor != 0; i++) {
261 pid = (struct pci_device_id *)&driver->pci_driver.id_table[i]; 259 pid = (struct pci_device_id *)&driver->pci_driver.id_table[i];
262 260
@@ -383,6 +381,8 @@ static int __init drm_core_init(void)
383 goto err_p3; 381 goto err_p3;
384 } 382 }
385 383
384 drm_mem_init();
385
386 DRM_INFO("Initialized %s %d.%d.%d %s\n", 386 DRM_INFO("Initialized %s %d.%d.%d %s\n",
387 CORE_NAME, CORE_MAJOR, CORE_MINOR, CORE_PATCHLEVEL, CORE_DATE); 387 CORE_NAME, CORE_MAJOR, CORE_MINOR, CORE_PATCHLEVEL, CORE_DATE);
388 return 0; 388 return 0;