diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-09-20 22:24:58 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-09-20 22:24:58 +0200 |
commit | ae2249e41af5b795e7869c2995c950b48d39cc35 (patch) | |
tree | c9192dd408be0e22ff3b664901ed3838fc2a01d3 /drivers/gpu/drm/nouveau/nouveau_sgdma.c | |
parent | 72787aa866bfa6bcbd259e7a39b2f9a2f412794e (diff) | |
parent | 2520123382e97271e932377c83bca010c265be55 (diff) | |
download | talos-op-linux-ae2249e41af5b795e7869c2995c950b48d39cc35.tar.gz talos-op-linux-ae2249e41af5b795e7869c2995c950b48d39cc35.zip |
Merge branch 'samsung/board' into next/board
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_sgdma.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_sgdma.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_sgdma.c b/drivers/gpu/drm/nouveau/nouveau_sgdma.c index c444cadbf849..2706cb3d871a 100644 --- a/drivers/gpu/drm/nouveau/nouveau_sgdma.c +++ b/drivers/gpu/drm/nouveau/nouveau_sgdma.c @@ -37,8 +37,11 @@ nouveau_sgdma_populate(struct ttm_backend *be, unsigned long num_pages, return -ENOMEM; nvbe->ttm_alloced = kmalloc(sizeof(bool) * num_pages, GFP_KERNEL); - if (!nvbe->ttm_alloced) + if (!nvbe->ttm_alloced) { + kfree(nvbe->pages); + nvbe->pages = NULL; return -ENOMEM; + } nvbe->nr_pages = 0; while (num_pages--) { @@ -126,7 +129,7 @@ nv04_sgdma_bind(struct ttm_backend *be, struct ttm_mem_reg *mem) for (j = 0; j < PAGE_SIZE / NV_CTXDMA_PAGE_SIZE; j++, pte++) { nv_wo32(gpuobj, (pte * 4) + 0, offset_l | 3); - dma_offset += NV_CTXDMA_PAGE_SIZE; + offset_l += NV_CTXDMA_PAGE_SIZE; } } |