2 files changed, 9 insertions, 3 deletions

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
index 31786b200afc..a3357ff7540d 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
@@ -311,7 +311,13 @@ static dma_addr_t __vmw_piter_dma_addr(struct vmw_piter *viter)
 
 static dma_addr_t __vmw_piter_sg_addr(struct vmw_piter *viter)
 {
-        return sg_page_iter_dma_address(&viter->iter);
+        /*
+         * FIXME: This driver wrongly mixes DMA and CPU SG list iteration and
+         * needs revision. See
+         * https://lore.kernel.org/lkml/20190104223531.GA1705@ziepe.ca/
+         */
+        return sg_page_iter_dma_address(
+                container_of(&viter->iter, struct sg_dma_page_iter, base));
 }
 
 
diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2.c b/drivers/media/pci/intel/ipu3/ipu3-cio2.c
index cdb79ae2d8dc..9fbfbda74171 100644
--- a/drivers/media/pci/intel/ipu3/ipu3-cio2.c
+++ b/drivers/media/pci/intel/ipu3/ipu3-cio2.c
@@ -846,7 +846,7 @@ static int cio2_vb2_buf_init(struct vb2_buffer *vb)
         unsigned int pages = DIV_ROUND_UP(vb->planes[0].length, CIO2_PAGE_SIZE);
         unsigned int lops = DIV_ROUND_UP(pages + 1, entries_per_page);
         struct sg_table *sg;
-        struct sg_page_iter sg_iter;
+        struct sg_dma_page_iter sg_iter;
         int i, j;
 
         if (lops <= 0 || lops > CIO2_MAX_LOPS) {
@@ -873,7 +873,7 @@ static int cio2_vb2_buf_init(struct vb2_buffer *vb)
                 b->offset = sg->sgl->offset;
 
         i = j = 0;
-        for_each_sg_page(sg->sgl, &sg_iter, sg->nents, 0) {
+        for_each_sg_dma_page (sg->sgl, &sg_iter, sg->nents, 0) {
                 if (!pages--)
                         break;
                 b->lop[i][j] = sg_page_iter_dma_address(&sg_iter) >> PAGE_SHIFT;