Subject: linux-next: manual merge of the drm-misc tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 27 Oct 2020 12:26:28 +1100

Hi all,

Today's linux-next merge of the drm-misc tree got a conflict in:

  drivers/gpu/drm/virtio/virtgpu_vq.c

between commit:

  75ef337bdba4 ("drm: virtio: fix common struct sg_table related issues")

from Linus' tree and commit:

  50c3d1938ee3 ("drm/virtio: implement blob resources: fix stride discrepancy")

from the drm-misc tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/virtio/virtgpu_vq.c
index 07945ca238e2,c1824f536936..000000000000
--- a/drivers/gpu/drm/virtio/virtgpu_vq.c
+++ b/drivers/gpu/drm/virtio/virtgpu_vq.c
@@@ -1024,11 -1027,14 +1026,13 @@@ void virtio_gpu_cmd_transfer_to_host_3d
  	struct virtio_gpu_transfer_host_3d *cmd_p;
  	struct virtio_gpu_vbuffer *vbuf;
  	bool use_dma_api = !virtio_has_dma_quirk(vgdev->vdev);
- 	struct virtio_gpu_object_shmem *shmem = to_virtio_gpu_shmem(bo);
  
- 	if (use_dma_api)
+ 	if (virtio_gpu_is_shmem(bo) && use_dma_api) {
+ 		struct virtio_gpu_object_shmem *shmem = to_virtio_gpu_shmem(bo);
+ 
 -		dma_sync_sg_for_device(vgdev->vdev->dev.parent,
 -				       shmem->pages->sgl, shmem->pages->nents,
 -				       DMA_TO_DEVICE);
 +		dma_sync_sgtable_for_device(vgdev->vdev->dev.parent,
 +					    shmem->pages, DMA_TO_DEVICE);
+ 	}
  
  	cmd_p = virtio_gpu_alloc_cmd(vgdev, &vbuf, sizeof(*cmd_p));
  	memset(cmd_p, 0, sizeof(*cmd_p));