5 Nov
2010
5 Nov
'10
9:29 a.m.
On 11/05/2010 04:07 AM, Joe Perches wrote:
Signed-off-by: Joe Perchesjoe@perches.com
Reviewed-by: Thomas Hellstrom thellstrom@vmware.com
drivers/gpu/drm/via/via_dmablit.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/via/via_dmablit.c b/drivers/gpu/drm/via/via_dmablit.c index 9b5b4d9..3e038a3 100644 --- a/drivers/gpu/drm/via/via_dmablit.c +++ b/drivers/gpu/drm/via/via_dmablit.c @@ -235,9 +235,9 @@ via_lock_all_dma_pages(drm_via_sg_info_t *vsg, drm_via_dmablit_t *xfer) vsg->num_pages = VIA_PFN(xfer->mem_addr + (xfer->num_lines * xfer->mem_stride - 1)) - first_pfn + 1;
- if (NULL == (vsg->pages = vmalloc(sizeof(struct page *) * vsg->num_pages)))
- vsg->pages = vzalloc(sizeof(struct page *) * vsg->num_pages);
- if (NULL == vsg->pages) return -ENOMEM;
- memset(vsg->pages, 0, sizeof(struct page *) * vsg->num_pages); down_read(¤t->mm->mmap_sem); ret = get_user_pages(current, current->mm, (unsigned long)xfer->mem_addr,