geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nouveau: make sure initial kalloc for user bo ends up in the right place 

- Currently reloc'ing a user bo to gart will first cause an allocation in vram,
which is then written to by cpu, then the bo gets moved to gart.

Acked-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
main
Maarten Maathuis 2010-02-24 23:10:34 +01:00
parent a1f9ea765d
commit cdc788d645
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nouveau/nouveau_reloc.c
View File

@ -73,6 +73,12 @@ nouveau_reloc_emit(struct nouveau_channel *chan, struct nouveau_bo *reloc_bo,
return -EINVAL; return -EINVAL;
} }
/* We're about to reloc a user buffer, better make sure we don't cause
* a double migration.
*/
if (!(nvbo->flags & (NOUVEAU_BO_GART | NOUVEAU_BO_VRAM)))
nvbo->flags |= (flags & (NOUVEAU_BO_GART | NOUVEAU_BO_VRAM));
rpbbo = nouveau_bo_emit_buffer(chan, reloc_bo); rpbbo = nouveau_bo_emit_buffer(chan, reloc_bo);
if (!rpbbo) if (!rpbbo)
return -ENOMEM; return -ENOMEM;