diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2007-08-10 13:53:10 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2007-08-10 13:53:10 +1000 |
| commit | 39907f613b6c84499c34c9a6ece5f5dde64788c0 (patch) | |
| tree | 6056d3cc52bf0999746a5d6817e586154fc4b42b /shared-core/nouveau_state.c | |
| parent | 7784e8c6e74b93ffb39d82e3385bd3268a55507c (diff) | |
nouveau: Allow creation of gpuobjs before any other init has taken place.
Diffstat (limited to 'shared-core/nouveau_state.c')
| -rw-r--r-- | shared-core/nouveau_state.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/shared-core/nouveau_state.c b/shared-core/nouveau_state.c index e80e77a5..eac38060 100644 --- a/shared-core/nouveau_state.c +++ b/shared-core/nouveau_state.c @@ -296,7 +296,8 @@ nouveau_card_init(struct drm_device *dev) engine = &dev_priv->Engine; dev_priv->init_state = NOUVEAU_CARD_INIT_FAILED; - INIT_LIST_HEAD(&dev_priv->gpuobj_list); + ret = nouveau_gpuobj_early_init(dev); + if (ret) return ret; /* Initialise instance memory, must happen before mem_init so we * know exactly how much VRAM we're able to use for "normal" @@ -375,6 +376,8 @@ static void nouveau_card_takedown(struct drm_device *dev) drm_irq_uninstall(dev); + nouveau_gpuobj_late_takedown(dev); + dev_priv->init_state = NOUVEAU_CARD_INIT_DOWN; } } |