aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2012-05-18 15:31:12 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-01 15:12:59 +0800
commit129b34bc3dd345b071ec9eba88ced71f6cd8d340 (patch)
tree554a7e42562ce431bf9a0f9e3c4160a3253e8731
parent808cf72ca9988a146dff8a8f658dcbad3cd31d5d (diff)
downloadkernel_samsung_smdk4412-129b34bc3dd345b071ec9eba88ced71f6cd8d340.zip
kernel_samsung_smdk4412-129b34bc3dd345b071ec9eba88ced71f6cd8d340.tar.gz
kernel_samsung_smdk4412-129b34bc3dd345b071ec9eba88ced71f6cd8d340.tar.bz2
nouveau: nouveau_set_bo_placement takes TTM flags
commit c284815debba2f14ee2fd07b1b4cc972ab116110 upstream. This seems to be wrong to me, spotted while thinking about dma-buf. Reviewed-by: Ben Skeggs <bskeggs@redhat.com> Signed-off-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_bo.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
index 2ad49cb..5fb98de 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -1075,7 +1075,7 @@ nouveau_ttm_fault_reserve_notify(struct ttm_buffer_object *bo)
nvbo->placement.fpfn = 0;
nvbo->placement.lpfn = dev_priv->fb_mappable_pages;
- nouveau_bo_placement_set(nvbo, TTM_PL_VRAM, 0);
+ nouveau_bo_placement_set(nvbo, TTM_PL_FLAG_VRAM, 0);
return nouveau_bo_validate(nvbo, false, true, false);
}