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, 4 insertions, 10 deletions

diff --git a/drivers/gpu/drm/virtio/virtgpu_fb.c b/drivers/gpu/drm/virtio/virtgpu_fb.c
index b9678c4082ac..cea749f4ec39 100644
--- a/drivers/gpu/drm/virtio/virtgpu_fb.c
+++ b/drivers/gpu/drm/virtio/virtgpu_fb.c
@@ -95,7 +95,7 @@ static int virtio_gpu_dirty_update(struct virtio_gpu_framebuffer *fb,
 
                 offset = (y * fb->base.pitches[0]) + x * bpp;
 
-                virtio_gpu_cmd_transfer_to_host_2d(vgdev, obj->hw_res_handle,
+                virtio_gpu_cmd_transfer_to_host_2d(vgdev, obj,
                                                    offset,
                                                    cpu_to_le32(w),
                                                    cpu_to_le32(h),
@@ -203,12 +203,6 @@ static struct fb_ops virtio_gpufb_ops = {
         .fb_imageblit = virtio_gpu_3d_imageblit,
 };
 
-static int virtio_gpu_vmap_fb(struct virtio_gpu_device *vgdev,
-                              struct virtio_gpu_object *obj)
-{
-        return virtio_gpu_object_kmap(obj, NULL);
-}
-
 static int virtio_gpufb_create(struct drm_fb_helper *helper,
                                struct drm_fb_helper_surface_size *sizes)
 {
@@ -226,7 +220,7 @@ static int virtio_gpufb_create(struct drm_fb_helper *helper,
         mode_cmd.width = sizes->surface_width;
         mode_cmd.height = sizes->surface_height;
         mode_cmd.pitches[0] = mode_cmd.width * 4;
-        mode_cmd.pixel_format = drm_mode_legacy_fb_format(32, 24);
+        mode_cmd.pixel_format = DRM_FORMAT_HOST_XRGB8888;
 
         format = virtio_gpu_translate_format(mode_cmd.pixel_format);
         if (format == 0)
@@ -241,9 +235,9 @@ static int virtio_gpufb_create(struct drm_fb_helper *helper,
         virtio_gpu_cmd_create_resource(vgdev, resid, format,
                                        mode_cmd.width, mode_cmd.height);
 
-        ret = virtio_gpu_vmap_fb(vgdev, obj);
+        ret = virtio_gpu_object_kmap(obj);
         if (ret) {
-                DRM_ERROR("failed to vmap fb %d\n", ret);
+                DRM_ERROR("failed to kmap fb %d\n", ret);
                 goto err_obj_vmap;
         }