Commit 3260f9fd authored by Dave Airlie's avatar Dave Airlie Committed by Dave Airlie

drm: move drm_mem_init to proper place in startup sequence

For TTM this needs to be called later.
Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent 2716a02f
...@@ -255,8 +255,6 @@ int drm_init(struct drm_driver *driver) ...@@ -255,8 +255,6 @@ int drm_init(struct drm_driver *driver)
DRM_DEBUG("\n"); DRM_DEBUG("\n");
drm_mem_init();
for (i = 0; driver->pci_driver.id_table[i].vendor != 0; i++) { for (i = 0; driver->pci_driver.id_table[i].vendor != 0; i++) {
pid = (struct pci_device_id *)&driver->pci_driver.id_table[i]; pid = (struct pci_device_id *)&driver->pci_driver.id_table[i];
...@@ -383,6 +381,8 @@ static int __init drm_core_init(void) ...@@ -383,6 +381,8 @@ static int __init drm_core_init(void)
goto err_p3; goto err_p3;
} }
drm_mem_init();
DRM_INFO("Initialized %s %d.%d.%d %s\n", DRM_INFO("Initialized %s %d.%d.%d %s\n",
CORE_NAME, CORE_MAJOR, CORE_MINOR, CORE_PATCHLEVEL, CORE_DATE); CORE_NAME, CORE_MAJOR, CORE_MINOR, CORE_PATCHLEVEL, CORE_DATE);
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment