diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2010-01-21 15:03:23 +1000 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2010-01-25 10:35:19 +1000 |
commit | 0208843dd59330c30e0773c77d5362260aa340e0 (patch) | |
tree | c37f2dffe30c252b7f0a46fe5e8f6462227fd98f /drivers/gpu/drm/nouveau | |
parent | a1470890f29da73783e932078ed911f5871e3ad3 (diff) | |
download | op-kernel-dev-0208843dd59330c30e0773c77d5362260aa340e0.zip op-kernel-dev-0208843dd59330c30e0773c77d5362260aa340e0.tar.gz |
drm/nouveau: fix failure path if userspace specifies no valid memtypes
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>
Diffstat (limited to 'drivers/gpu/drm/nouveau')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_gem.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c index 5048330..6ac804b 100644 --- a/drivers/gpu/drm/nouveau/nouveau_gem.c +++ b/drivers/gpu/drm/nouveau/nouveau_gem.c @@ -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; } |