Merge tag 'drm-misc-next-2018-09-27' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

drm-misc-next for 4.20:

UAPI Changes:
- None

Cross-subsystem Changes:
- MAINTAINERS: Move udl, mxsfb, and fsl-dcu into drm-misc (Stefan, Sean)

Core Changes:
- syncobj: Check condition before returning timeout in schedule() (Chris)

Driver Changes:
- various: First wave of drm_fbdev_generic_setup() conversions (Noralf)
- bochs/virtio: More format byte-order improvements (Gerd)
- mxsfb: A couple fixes + add runtime pm support (Leonard)
- virtio: Add vmap support for prime objects (Ezequiel)

Cc: Stefan Agner <stefan@agner.ch>
Cc: Sean Paul <sean@poorly.run>
Cc: Noralf Trønnes <noralf@tronnes.org>
Cc: Gerd Hoffman <kraxel@redhat.com>
Cc: Leonard Crestez <leonard.crestez@nxp.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Ezequiel Garcia <ezequiel@collabora.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20180927093950.GA180365@art_vandelay

1 files changed, 8 insertions, 12 deletions

diff --git a/drivers/gpu/drm/virtio/virtgpu_vq.c b/drivers/gpu/drm/virtio/virtgpu_vq.c
index df32811f2c3e..4e2e037aed34 100644
--- a/drivers/gpu/drm/virtio/virtgpu_vq.c
+++ b/drivers/gpu/drm/virtio/virtgpu_vq.c
@@ -483,28 +483,26 @@ void virtio_gpu_cmd_resource_flush(struct virtio_gpu_device *vgdev,
 }
 
 void virtio_gpu_cmd_transfer_to_host_2d(struct virtio_gpu_device *vgdev,
-                                        uint32_t resource_id, uint64_t offset,
+                                        struct virtio_gpu_object *bo,
+                                        uint64_t offset,
                                         __le32 width, __le32 height,
                                         __le32 x, __le32 y,
                                         struct virtio_gpu_fence **fence)
 {
         struct virtio_gpu_transfer_to_host_2d *cmd_p;
         struct virtio_gpu_vbuffer *vbuf;
-        struct virtio_gpu_fbdev *vgfbdev = vgdev->vgfbdev;
-        struct virtio_gpu_framebuffer *fb = &vgfbdev->vgfb;
-        struct virtio_gpu_object *obj = gem_to_virtio_gpu_obj(fb->base.obj[0]);
         bool use_dma_api = !virtio_has_iommu_quirk(vgdev->vdev);
 
         if (use_dma_api)
                 dma_sync_sg_for_device(vgdev->vdev->dev.parent,
-                                       obj->pages->sgl, obj->pages->nents,
+                                       bo->pages->sgl, bo->pages->nents,
                                        DMA_TO_DEVICE);
 
         cmd_p = virtio_gpu_alloc_cmd(vgdev, &vbuf, sizeof(*cmd_p));
         memset(cmd_p, 0, sizeof(*cmd_p));
 
         cmd_p->hdr.type = cpu_to_le32(VIRTIO_GPU_CMD_TRANSFER_TO_HOST_2D);
-        cmd_p->resource_id = cpu_to_le32(resource_id);
+        cmd_p->resource_id = cpu_to_le32(bo->hw_res_handle);
         cmd_p->offset = cpu_to_le64(offset);
         cmd_p->r.width = width;
         cmd_p->r.height = height;
@@ -791,21 +789,19 @@ virtio_gpu_cmd_resource_create_3d(struct virtio_gpu_device *vgdev,
 }
 
 void virtio_gpu_cmd_transfer_to_host_3d(struct virtio_gpu_device *vgdev,
-                                        uint32_t resource_id, uint32_t ctx_id,
+                                        struct virtio_gpu_object *bo,
+                                        uint32_t ctx_id,
                                         uint64_t offset, uint32_t level,
                                         struct virtio_gpu_box *box,
                                         struct virtio_gpu_fence **fence)
 {
         struct virtio_gpu_transfer_host_3d *cmd_p;
         struct virtio_gpu_vbuffer *vbuf;
-        struct virtio_gpu_fbdev *vgfbdev = vgdev->vgfbdev;
-        struct virtio_gpu_framebuffer *fb = &vgfbdev->vgfb;
-        struct virtio_gpu_object *obj = gem_to_virtio_gpu_obj(fb->base.obj[0]);
         bool use_dma_api = !virtio_has_iommu_quirk(vgdev->vdev);
 
         if (use_dma_api)
                 dma_sync_sg_for_device(vgdev->vdev->dev.parent,
-                                       obj->pages->sgl, obj->pages->nents,
+                                       bo->pages->sgl, bo->pages->nents,
                                        DMA_TO_DEVICE);
 
         cmd_p = virtio_gpu_alloc_cmd(vgdev, &vbuf, sizeof(*cmd_p));
@@ -813,7 +809,7 @@ void virtio_gpu_cmd_transfer_to_host_3d(struct virtio_gpu_device *vgdev,
 
         cmd_p->hdr.type = cpu_to_le32(VIRTIO_GPU_CMD_TRANSFER_TO_HOST_3D);
         cmd_p->hdr.ctx_id = cpu_to_le32(ctx_id);
-        cmd_p->resource_id = cpu_to_le32(resource_id);
+        cmd_p->resource_id = cpu_to_le32(bo->hw_res_handle);
         cmd_p->box = *box;
         cmd_p->offset = cpu_to_le64(offset);
         cmd_p->level = cpu_to_le32(level);