From: Ben Skeggs <bskeggs@redhat.com>
Date: Thu, 21 Jan 2010 05:03:23 +0000 (+1000)
Subject: drm/nouveau: fix failure path if userspace specifies no valid memtypes
X-Git-Tag: MMI-PSA29.97-13-9~23984^2~84^2~65
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0208843dd59330c30e0773c77d5362260aa340e0;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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>
---

diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
index 504833044080..6ac804b0c9f9 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;
 		}