summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Skeggs <skeggsb@gmail.com>2007-08-07 01:51:46 +1000
committerBen Skeggs <skeggsb@gmail.com>2007-08-07 01:52:49 +1000
commit66f5232d9393f6886d8fd1a60b2d75cd009b972c (patch)
treed0f8c5e1d0fc52d925fa5eba5bcd361a51015ffd
parentac24f328ec8954f78b1025db716abdd5b25b3dd9 (diff)
nouveau: Init global gpuobj list early, unbreaks sgdma code.
-rw-r--r--shared-core/nouveau_object.c2
-rw-r--r--shared-core/nouveau_state.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/shared-core/nouveau_object.c b/shared-core/nouveau_object.c
index 22ad23cd..bb096531 100644
--- a/shared-core/nouveau_object.c
+++ b/shared-core/nouveau_object.c
@@ -270,8 +270,6 @@ nouveau_gpuobj_init(struct drm_device *dev)
struct drm_nouveau_private *dev_priv = dev->dev_private;
int ret;
- INIT_LIST_HEAD(&dev_priv->gpuobj_list);
-
if (dev_priv->card_type < NV_50) {
if ((ret = nouveau_gpuobj_new_fake(dev, dev_priv->ramht_offset,
dev_priv->ramht_size,
diff --git a/shared-core/nouveau_state.c b/shared-core/nouveau_state.c
index 9dab34cc..a23d6001 100644
--- a/shared-core/nouveau_state.c
+++ b/shared-core/nouveau_state.c
@@ -299,6 +299,8 @@ nouveau_card_init(struct drm_device *dev)
ret = drm_irq_install(dev);
if (ret) return ret;
+ INIT_LIST_HEAD(&dev_priv->gpuobj_list);
+
/* Initialise instance memory, must happen before mem_init so we
* know exactly how much VRAM we're able to use for "normal"
* purposes.