Skip to content

Commit

Permalink
drm: move drm_mem_init to proper place in startup sequence
Browse files Browse the repository at this point in the history
For TTM this needs to be called later.

Signed-off-by: Dave Airlie <airlied@linux.ie>
  • Loading branch information
Dave Airlie authored and Dave Airlie committed Feb 7, 2008
1 parent 2716a02 commit 3260f9f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/char/drm/drm_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -255,8 +255,6 @@ int drm_init(struct drm_driver *driver)

DRM_DEBUG("\n");

drm_mem_init();

for (i = 0; driver->pci_driver.id_table[i].vendor != 0; i++) {
pid = (struct pci_device_id *)&driver->pci_driver.id_table[i];

Expand Down Expand Up @@ -383,6 +381,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);
return 0;
Expand Down

0 comments on commit 3260f9f

Please sign in to comment.