diff options
| author | Tejun Heo <tj@kernel.org> | 2010-04-04 22:37:28 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-04-04 22:37:28 -0400 |
| commit | 336f5899d287f06d8329e208fc14ce50f7ec9698 (patch) | |
| tree | 9b762d450d5eb248a6ff8317badb7e223d93ed58 /drivers/gpu/drm/nouveau/nouveau_bo.c | |
| parent | a4ab2773205e8b94c18625455f85e3b6bb9d7ad6 (diff) | |
| parent | db217dece3003df0841bacf9556b5c06aa097dae (diff) | |
Merge branch 'master' into export-slabh
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_bo.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_bo.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index 69c575dff0a2..9042dd7fb058 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c | |||
| @@ -440,8 +440,7 @@ nouveau_bo_evict_flags(struct ttm_buffer_object *bo, struct ttm_placement *pl) | |||
| 440 | 440 | ||
| 441 | switch (bo->mem.mem_type) { | 441 | switch (bo->mem.mem_type) { |
| 442 | case TTM_PL_VRAM: | 442 | case TTM_PL_VRAM: |
| 443 | nouveau_bo_placement_set(nvbo, TTM_PL_FLAG_TT | | 443 | nouveau_bo_placement_set(nvbo, TTM_PL_FLAG_TT); |
| 444 | TTM_PL_FLAG_SYSTEM); | ||
| 445 | break; | 444 | break; |
| 446 | default: | 445 | default: |
| 447 | nouveau_bo_placement_set(nvbo, TTM_PL_FLAG_SYSTEM); | 446 | nouveau_bo_placement_set(nvbo, TTM_PL_FLAG_SYSTEM); |