Merge branch 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar...

[linux-2.6-microblaze.git] / drivers / gpu / drm / v3d / v3d_mmu.c

diff --git a/drivers/gpu/drm/v3d/v3d_mmu.c b/drivers/gpu/drm/v3d/v3d_mmu.c
index 3b81ea2..5a45353 100644 (file)
--- a/drivers/gpu/drm/v3d/v3d_mmu.c
+++ b/drivers/gpu/drm/v3d/v3d_mmu.c
@@ -90,18 +90,17 @@ void v3d_mmu_insert_ptes(struct v3d_bo *bo)
        struct v3d_dev *v3d = to_v3d_dev(shmem_obj->base.dev);
        u32 page = bo->node.start;
        u32 page_prot = V3D_PTE_WRITEABLE | V3D_PTE_VALID;
-       unsigned int count;
-       struct scatterlist *sgl;
+       struct sg_dma_page_iter dma_iter;
 
-       for_each_sg(shmem_obj->sgt->sgl, sgl, shmem_obj->sgt->nents, count) {
-               u32 page_address = sg_dma_address(sgl) >> V3D_MMU_PAGE_SHIFT;
+       for_each_sgtable_dma_page(shmem_obj->sgt, &dma_iter, 0) {
+               dma_addr_t dma_addr = sg_page_iter_dma_address(&dma_iter);
+               u32 page_address = dma_addr >> V3D_MMU_PAGE_SHIFT;
                u32 pte = page_prot | page_address;
                u32 i;
 
-               BUG_ON(page_address + (sg_dma_len(sgl) >> V3D_MMU_PAGE_SHIFT) >=
+               BUG_ON(page_address + (PAGE_SIZE >> V3D_MMU_PAGE_SHIFT) >=
                       BIT(24));
-
-               for (i = 0; i < sg_dma_len(sgl) >> V3D_MMU_PAGE_SHIFT; i++)
+               for (i = 0; i < PAGE_SIZE >> V3D_MMU_PAGE_SHIFT; i++)
                        v3d->pt[page++] = pte + i;
        }