diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2011-03-07 17:18:03 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-03-08 07:03:01 +1000 |
| commit | ef1b287169cd3d1e428c8ed8222e0bbf733d5dbb (patch) | |
| tree | 87802c1a32ad130065f2ba35a73d9da6a8632d40 | |
| parent | fb62c00a6d8942775abc23d1621db1252e2d93d1 (diff) | |
| download | kernel_samsung_espresso10-ef1b287169cd3d1e428c8ed8222e0bbf733d5dbb.zip kernel_samsung_espresso10-ef1b287169cd3d1e428c8ed8222e0bbf733d5dbb.tar.gz kernel_samsung_espresso10-ef1b287169cd3d1e428c8ed8222e0bbf733d5dbb.tar.bz2 | |
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>
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_mem.c | 6 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_mm.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c index 26347b7..b0fb9bd 100644 --- a/drivers/gpu/drm/nouveau/nouveau_mem.c +++ b/drivers/gpu/drm/nouveau/nouveau_mem.c @@ -725,8 +725,10 @@ nouveau_vram_manager_new(struct ttm_mem_type_manager *man, ret = vram->get(dev, mem->num_pages << PAGE_SHIFT, mem->page_alignment << PAGE_SHIFT, size_nc, (nvbo->tile_flags >> 8) & 0xff, &node); - if (ret) - return ret; + if (ret) { + mem->mm_node = NULL; + return (ret == -ENOSPC) ? 0 : ret; + } node->page_shift = 12; if (nvbo->vma.node) diff --git a/drivers/gpu/drm/nouveau/nouveau_mm.c b/drivers/gpu/drm/nouveau/nouveau_mm.c index 8844b50..7609756 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 |