nouveau: Init global gpuobj list early, unbreaks sgdma code.

diff --git a/shared-core/nouveau_object.c b/shared-core/nouveau_object.c
index 22ad23c..bb09653 100644 (file)
--- 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 9dab34c..a23d600 100644 (file)
--- 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.