Merge tag 'powerpc-4.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[karo-tx-linux.git] / drivers / gpu / drm / via / via_dmablit.c

diff --git a/drivers/gpu/drm/via/via_dmablit.c b/drivers/gpu/drm/via/via_dmablit.c
index 1a3ad769f8c85bc0506741d105669dd66013b533..98aae9809249d6b8e897239c81e4c44925ca62db 100644 (file)
--- a/drivers/gpu/drm/via/via_dmablit.c
+++ b/drivers/gpu/drm/via/via_dmablit.c
@@ -238,13 +238,9 @@ via_lock_all_dma_pages(drm_via_sg_info_t *vsg,  drm_via_dmablit_t *xfer)
        vsg->pages = vzalloc(sizeof(struct page *) * vsg->num_pages);
        if (NULL == vsg->pages)
                return -ENOMEM;
-       down_read(&current->mm->mmap_sem);
-       ret = get_user_pages((unsigned long)xfer->mem_addr,
-                            vsg->num_pages,
-                            (vsg->direction == DMA_FROM_DEVICE) ? FOLL_WRITE : 0,
-                            vsg->pages, NULL);
-
-       up_read(&current->mm->mmap_sem);
+       ret = get_user_pages_unlocked((unsigned long)xfer->mem_addr,
+                       vsg->num_pages, vsg->pages,
+                       (vsg->direction == DMA_FROM_DEVICE) ? FOLL_WRITE : 0);
        if (ret != vsg->num_pages) {
                if (ret < 0)
                        return ret;