summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/nouveau/nouveau_mm.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2011-03-07 17:18:03 +1000
committerDave Airlie <airlied@redhat.com>2011-03-08 07:03:01 +1000
commitef1b287169cd3d1e428c8ed8222e0bbf733d5dbb (patch)
tree87802c1a32ad130065f2ba35a73d9da6a8632d40 /drivers/gpu/drm/nouveau/nouveau_mm.c
parentfb62c00a6d8942775abc23d1621db1252e2d93d1 (diff)
downloadlwn-ef1b287169cd3d1e428c8ed8222e0bbf733d5dbb.tar.gz
lwn-ef1b287169cd3d1e428c8ed8222e0bbf733d5dbb.zip
drm/nouveau: fix regression causing ttm to not be able to evict vram
TTM assumes an error condition from man->func->get_node() means that something went horribly wrong, and causes it to bail. The driver is supposed to return 0, and leave mm_node == NULL to signal that it couldn't allocate any memory. Signed-off-by: Ben Skeggs <bskeggs@redhat.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_mm.c')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_mm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_mm.c b/drivers/gpu/drm/nouveau/nouveau_mm.c
index 8844b50c3e54..7609756b6faf 100644
--- a/drivers/gpu/drm/nouveau/nouveau_mm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_mm.c
@@ -123,7 +123,7 @@ nouveau_mm_get(struct nouveau_mm *rmm, int type, u32 size, u32 size_nc,
return 0;
}
- return -ENOMEM;
+ return -ENOSPC;
}
int