Commit a54bace0 authored Feb 24, 2023 by Oleksandr Tyshchenko Committed by Dmitry Osipenko Feb 27, 2023

drm/virtio: Pass correct device to dma_sync_sgtable_for_device()

The "vdev->dev.parent" should be used instead of "vdev->dev" as a device
for which to perform the DMA operation in both
virtio_gpu_cmd_transfer_to_host_2d(3d).

Because the virtio-gpu device "vdev->dev" doesn't really have DMA OPS
assigned to it, but parent (virtio-pci or virtio-mmio) device
"vdev->dev.parent" has. The more, the sgtable in question the code is
trying to sync here was mapped for the parent device (by using its DMA OPS)
previously at:
virtio_gpu_object_shmem_init()->drm_gem_shmem_get_pages_sgt()->
dma_map_sgtable(), so should be synced here for the same parent device.

Fixes: b5c9ed70 ("drm/virtio: Improve DMA API usage for shmem BOs")
Signed-off-by: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
Reviewed-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230224153450.526222-1-olekstysh@gmail.com

parent 1b9b4f92

drivers/gpu/drm/virtio/virtgpu_vq.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -597,7 +597,7 @@ void virtio_gpu_cmd_transfer_to_host_2d(struct virtio_gpu_device *vgdev,
		bool use_dma_api = !virtio_has_dma_quirk(vgdev->vdev);

		if (virtio_gpu_is_shmem(bo) && use_dma_api)
		dma_sync_sgtable_for_device(&vgdev->vdev->dev,
		dma_sync_sgtable_for_device(vgdev->vdev->dev.parent,
		bo->base.sgt, DMA_TO_DEVICE);

		cmd_p = virtio_gpu_alloc_cmd(vgdev, &vbuf, sizeof(*cmd_p));
		@@ -1019,7 +1019,7 @@ void virtio_gpu_cmd_transfer_to_host_3d(struct virtio_gpu_device *vgdev,
		bool use_dma_api = !virtio_has_dma_quirk(vgdev->vdev);

		if (virtio_gpu_is_shmem(bo) && use_dma_api)
		dma_sync_sgtable_for_device(&vgdev->vdev->dev,
		dma_sync_sgtable_for_device(vgdev->vdev->dev.parent,
		bo->base.sgt, DMA_TO_DEVICE);

		cmd_p = virtio_gpu_alloc_cmd(vgdev, &vbuf, sizeof(*cmd_p));