summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2011-11-25 07:35:34 +0100
committerBen Skeggs <bskeggs@redhat.com>2011-11-30 14:41:05 +0100
commita10e9e1dbb39970f232b1e2b0e4f738e2d77079f (patch)
tree9571e0b1fdd82557d380301084b904510825a2c1 /drivers/gpu
parentdrm/nouveau: Keep RAMIN heap within the channel. (diff)
downloadlinux-a10e9e1dbb39970f232b1e2b0e4f738e2d77079f.tar.xz
linux-a10e9e1dbb39970f232b1e2b0e4f738e2d77079f.zip
drm/nouveau: fix oopses caused by clear being called on unpopulated ttms
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_sgdma.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_sgdma.c b/drivers/gpu/drm/nouveau/nouveau_sgdma.c
index b75258a9fe44..c8a463b76c89 100644
--- a/drivers/gpu/drm/nouveau/nouveau_sgdma.c
+++ b/drivers/gpu/drm/nouveau/nouveau_sgdma.c
@@ -67,7 +67,10 @@ nouveau_sgdma_clear(struct ttm_backend *be)
pci_unmap_page(dev->pdev, nvbe->pages[nvbe->nr_pages],
PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
}
+ nvbe->unmap_pages = false;
}
+
+ nvbe->pages = NULL;
}
static void