Merge tag 'drm-misc-next-2020-10-27' of git://anongit.freedesktop.org/drm/drm-misc...

[platform/kernel/linux-starfive.git] / drivers / gpu / drm / virtio / virtgpu_object.c

diff --git a/drivers/gpu/drm/virtio/virtgpu_object.c b/drivers/gpu/drm/virtio/virtgpu_object.c
index 50cbc36..2d3aa7b 100644 (file)
--- a/drivers/gpu/drm/virtio/virtgpu_object.c
+++ b/drivers/gpu/drm/virtio/virtgpu_object.c
@@ -71,9 +71,8 @@ void virtio_gpu_cleanup_object(struct virtio_gpu_object *bo)
 
                if (shmem->pages) {
                        if (shmem->mapped) {
-                               dma_unmap_sg(vgdev->vdev->dev.parent,
-                                            shmem->pages->sgl, shmem->mapped,
-                                            DMA_TO_DEVICE);
+                               dma_unmap_sgtable(vgdev->vdev->dev.parent,
+                                            shmem->pages, DMA_TO_DEVICE, 0);
                                shmem->mapped = 0;
                        }
 
@@ -176,13 +175,13 @@ static int virtio_gpu_object_shmem_init(struct virtio_gpu_device *vgdev,
        }
 
        if (use_dma_api) {
-               shmem->mapped = dma_map_sg(vgdev->vdev->dev.parent,
-                                          shmem->pages->sgl,
-                                          shmem->pages->nents,
-                                          DMA_TO_DEVICE);
-               *nents = shmem->mapped;
+               ret = dma_map_sgtable(vgdev->vdev->dev.parent,
+                                     shmem->pages, DMA_TO_DEVICE, 0);
+               if (ret)
+                       return ret;
+               *nents = shmem->mapped = shmem->pages->nents;
        } else {
-               *nents = shmem->pages->nents;
+               *nents = shmem->pages->orig_nents;
        }
 
        *ents = kmalloc_array(*nents, sizeof(struct virtio_gpu_mem_entry),
@@ -192,13 +191,20 @@ static int virtio_gpu_object_shmem_init(struct virtio_gpu_device *vgdev,
                return -ENOMEM;
        }
 
-       for_each_sg(shmem->pages->sgl, sg, *nents, si) {
-               (*ents)[si].addr = cpu_to_le64(use_dma_api
-                                              ? sg_dma_address(sg)
-                                              : sg_phys(sg));
-               (*ents)[si].length = cpu_to_le32(sg->length);
-               (*ents)[si].padding = 0;
+       if (use_dma_api) {
+               for_each_sgtable_dma_sg(shmem->pages, sg, si) {
+                       (*ents)[si].addr = cpu_to_le64(sg_dma_address(sg));
+                       (*ents)[si].length = cpu_to_le32(sg_dma_len(sg));
+                       (*ents)[si].padding = 0;
+               }
+       } else {
+               for_each_sgtable_sg(shmem->pages, sg, si) {
+                       (*ents)[si].addr = cpu_to_le64(sg_phys(sg));
+                       (*ents)[si].length = cpu_to_le32(sg->length);
+                       (*ents)[si].padding = 0;
+               }
        }
+
        return 0;
 }