Merge drm/drm-next into drm-misc-next

[linux-2.6-microblaze.git] / drivers / gpu / drm / vmwgfx / vmwgfx_ttm_buffer.c

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
index f35bdc1..e899a93 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
@@ -328,7 +328,6 @@ static int vmw_ttm_map_dma(struct vmw_ttm_tt *vmw_tt)
        int ret = 0;
        static size_t sgl_size;
        static size_t sgt_size;
-       struct scatterlist *sg;
 
        if (vmw_tt->mapped)
                return 0;
@@ -351,15 +350,12 @@ static int vmw_ttm_map_dma(struct vmw_ttm_tt *vmw_tt)
                if (unlikely(ret != 0))
                        return ret;
 
-               sg = __sg_alloc_table_from_pages(&vmw_tt->sgt, vsgt->pages,
-                               vsgt->num_pages, 0,
-                               (unsigned long) vsgt->num_pages << PAGE_SHIFT,
-                               dma_get_max_seg_size(dev_priv->drm.dev),
-                               NULL, 0, GFP_KERNEL);
-               if (IS_ERR(sg)) {
-                       ret = PTR_ERR(sg);
+               ret = sg_alloc_table_from_pages_segment(
+                       &vmw_tt->sgt, vsgt->pages, vsgt->num_pages, 0,
+                       (unsigned long)vsgt->num_pages << PAGE_SHIFT,
+                       dma_get_max_seg_size(dev_priv->drm.dev), GFP_KERNEL);
+               if (ret)
                        goto out_sg_alloc_fail;
-               }
 
                if (vsgt->num_pages > vmw_tt->sgt.orig_nents) {
                        uint64_t over_alloc =