diff options
| author | Dave Airlie <airlied@linux.ie> | 2007-11-22 18:43:46 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2008-02-07 15:09:39 +1000 |
| commit | 3260f9fdfee9d5b4135f40943dc0bd0733b7394e (patch) | |
| tree | c1b7b387d993d39dfd68e95d32deb6b6a142406e /drivers/char/drm | |
| parent | 2716a02f607c964ccaa6fa7266abd3acd73d9033 (diff) | |
| download | op-kernel-dev-3260f9fdfee9d5b4135f40943dc0bd0733b7394e.zip op-kernel-dev-3260f9fdfee9d5b4135f40943dc0bd0733b7394e.tar.gz | |
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>
Diffstat (limited to 'drivers/char/drm')
| -rw-r--r-- | drivers/char/drm/drm_drv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/drm/drm_drv.c b/drivers/char/drm/drm_drv.c index fc6e764..d29d7ed 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) 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]; @@ -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; |
