Merge branch 'drm-next-3.10' of git://people.freedesktop.org/~agd5f/linux into drm...

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / drm_prime.c

diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c
index 366910ddcfcb3cd96b33c2dcd9c1d122b01990b5..25d02187067e79e5f9b8df531a5e9328ec6e6fa0 100644 (file)
--- a/drivers/gpu/drm/drm_prime.c
+++ b/drivers/gpu/drm/drm_prime.c
@@ -401,21 +401,17 @@ int drm_prime_fd_to_handle_ioctl(struct drm_device *dev, void *data,
 struct sg_table *drm_prime_pages_to_sg(struct page **pages, int nr_pages)
 {
        struct sg_table *sg = NULL;
-       struct scatterlist *iter;
-       int i;
        int ret;
 
        sg = kmalloc(sizeof(struct sg_table), GFP_KERNEL);
        if (!sg)
                goto out;
 
-       ret = sg_alloc_table(sg, nr_pages, GFP_KERNEL);
+       ret = sg_alloc_table_from_pages(sg, pages, nr_pages, 0,
+                               nr_pages << PAGE_SHIFT, GFP_KERNEL);
        if (ret)
                goto out;
 
-       for_each_sg(sg->sgl, iter, nr_pages, i)
-               sg_set_page(iter, pages[i], PAGE_SIZE, 0);
-
        return sg;
 out:
        kfree(sg);