drm/nouveau: fix failure path if userspace specifies no valid memtypes
authorBen Skeggs <bskeggs@redhat.com>
Thu, 21 Jan 2010 05:03:23 +0000 (15:03 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Mon, 25 Jan 2010 00:35:19 +0000 (10:35 +1000)
We need to add the buffer to the list even if we fail, otherwise the
validate_fini() call won't unreserve + unreference the GEM object,
making TTM very unhappy.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nouveau_gem.c

index 504833044080123b0082badc757f082b8f49d037..6ac804b0c9f9d3f909de248563eae3093476a67f 100644 (file)
@@ -321,6 +321,7 @@ retry:
                else {
                        NV_ERROR(dev, "invalid valid domains: 0x%08x\n",
                                 b->valid_domains);
+                       list_add_tail(&nvbo->entry, &op->both_list);
                        validate_fini(op, NULL);
                        return -EINVAL;
                }