diff options
| author | Ben Skeggs | 2011-12-22 06:20:21 +0100 |
|---|---|---|
| committer | Ben Skeggs | 2011-12-22 06:23:25 +0100 |
| commit | f7b24c42da1a7bbb98145d27aa716d8af3cae2a6 (patch) | |
| tree | 78bf7271c755818a83faf713655a69f611cd23df /drivers/gpu/drm/nouveau/nouveau_vm.c | |
| parent | drm/nouveau: Fix notifier blocks over the 4GB mark. (diff) | |
| download | kernel-qcow2-linux-f7b24c42da1a7bbb98145d27aa716d8af3cae2a6.tar.gz kernel-qcow2-linux-f7b24c42da1a7bbb98145d27aa716d8af3cae2a6.tar.xz kernel-qcow2-linux-f7b24c42da1a7bbb98145d27aa716d8af3cae2a6.zip | |
drm/nouveau/ttm: fix crash as a result of a recent ttm change
"drm/ttm: callback move_notify any time bo placement change v4" failed to
avoid a NULL pointer dereference in nouveau caused by move_notify being
expected to handle that case now.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_vm.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_vm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_vm.c b/drivers/gpu/drm/nouveau/nouveau_vm.c index ef0832b29ad2..2bf6c0350b4b 100644 --- a/drivers/gpu/drm/nouveau/nouveau_vm.c +++ b/drivers/gpu/drm/nouveau/nouveau_vm.c @@ -78,9 +78,10 @@ nouveau_vm_map(struct nouveau_vma *vma, struct nouveau_mem *node) void nouveau_vm_map_sg(struct nouveau_vma *vma, u64 delta, u64 length, - struct nouveau_mem *mem, dma_addr_t *list) + struct nouveau_mem *mem) { struct nouveau_vm *vm = vma->vm; + dma_addr_t *list = mem->pages; int big = vma->node->type != vm->spg_shift; u32 offset = vma->node->offset + (delta >> 12); u32 bits = vma->node->type - 12; |