diff options
author | Alexandre Courbot <acourbot@nvidia.com> | 2014-11-04 13:12:29 +0900 |
---|---|---|
committer | Alexandre Courbot <acourbot@nvidia.com> | 2014-11-04 13:13:04 +0900 |
commit | 4263676b081aad1a4c627c2dba3cd3a200af6702 (patch) | |
tree | 10e4186883bacd7819b3d8a1e82affe69fcf1225 | |
parent | 7ebb2059ef9a8f18672d1624871ccdc4a3ad840b (diff) | |
download | nouveau-4263676b081aad1a4c627c2dba3cd3a200af6702.tar.gz |
Revert "drm/nouveau/vm: fix mapping of SG pages list"
This reverts commit c7216ec42b8d17dd40a99ccf4d1060baf4bb28a1.
-rw-r--r-- | nvkm/subdev/vm/base.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/nvkm/subdev/vm/base.c b/nvkm/subdev/vm/base.c index 583463cfe..f75a683bd 100644 --- a/nvkm/subdev/vm/base.c +++ b/nvkm/subdev/vm/base.c @@ -152,18 +152,13 @@ nouveau_vm_map_sg(struct nouveau_vma *vma, u64 delta, u64 length, end = (pte + num); if (unlikely(end >= max)) end = max; - - /* - * Map pages >4KB one by one so we can fix the list pointer - * as to not map intermediate pages to the next PTE - */ - len = bits ? 1 : end - pte; + len = end - pte; vmm->map_sg(vma, pgt, mem, pte, len, list); num -= len; pte += len; - list += len << bits; + list += len; if (unlikely(end >= max)) { pde++; pte = 0; |