9 files changed, 53 insertions, 94 deletions

diff --git a/drivers/gpu/drm/virtio/virtgpu_display.c b/drivers/gpu/drm/virtio/virtgpu_display.c
index 0379d6897659..8f8fed471e34 100644
--- a/drivers/gpu/drm/virtio/virtgpu_display.c
+++ b/drivers/gpu/drm/virtio/virtgpu_display.c
@@ -307,6 +307,10 @@ virtio_gpu_user_framebuffer_create(struct drm_device *dev,
         struct virtio_gpu_framebuffer *virtio_gpu_fb;
         int ret;
 
+        if (mode_cmd->pixel_format != DRM_FORMAT_HOST_XRGB8888 &&
+            mode_cmd->pixel_format != DRM_FORMAT_HOST_ARGB8888)
+                return ERR_PTR(-ENOENT);
+
         /* lookup object associated with res handle */
         obj = drm_gem_object_lookup(file_priv, mode_cmd->handles[0]);
         if (!obj)
@@ -355,6 +359,7 @@ int virtio_gpu_modeset_init(struct virtio_gpu_device *vgdev)
         int i;
 
         drm_mode_config_init(vgdev->ddev);
+        vgdev->ddev->mode_config.quirk_addfb_prefer_host_byte_order = true;
         vgdev->ddev->mode_config.funcs = &virtio_gpu_mode_funcs;
         vgdev->ddev->mode_config.helper_private = &virtio_mode_config_helpers;
 
diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h
index a2d79e18bda7..d29f0c7c768c 100644
--- a/drivers/gpu/drm/virtio/virtgpu_drv.h
+++ b/drivers/gpu/drm/virtio/virtgpu_drv.h
@@ -270,7 +270,8 @@ void virtio_gpu_cmd_create_resource(struct virtio_gpu_device *vgdev,
 void virtio_gpu_cmd_unref_resource(struct virtio_gpu_device *vgdev,
                                    uint32_t resource_id);
 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);
@@ -316,7 +317,8 @@ void virtio_gpu_cmd_transfer_from_host_3d(struct virtio_gpu_device *vgdev,
                                           struct virtio_gpu_box *box,
                                           struct virtio_gpu_fence **fence);
 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);
@@ -361,7 +363,8 @@ void virtio_gpu_fence_event_process(struct virtio_gpu_device *vdev,
 int virtio_gpu_object_create(struct virtio_gpu_device *vgdev,
                              unsigned long size, bool kernel, bool pinned,
                              struct virtio_gpu_object **bo_ptr);
-int virtio_gpu_object_kmap(struct virtio_gpu_object *bo, void **ptr);
+void virtio_gpu_object_kunmap(struct virtio_gpu_object *bo);
+int virtio_gpu_object_kmap(struct virtio_gpu_object *bo);
 int virtio_gpu_object_get_sg_table(struct virtio_gpu_device *qdev,
                                    struct virtio_gpu_object *bo);
 void virtio_gpu_object_free_sg_table(struct virtio_gpu_object *bo);
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;
         }
 
diff --git a/drivers/gpu/drm/virtio/virtgpu_gem.c b/drivers/gpu/drm/virtio/virtgpu_gem.c
index 0f2768eacaee..82c817f37cf7 100644
--- a/drivers/gpu/drm/virtio/virtgpu_gem.c
+++ b/drivers/gpu/drm/virtio/virtgpu_gem.c
@@ -90,7 +90,10 @@ int virtio_gpu_mode_dumb_create(struct drm_file *file_priv,
         uint32_t resid;
         uint32_t format;
 
-        pitch = args->width * ((args->bpp + 1) / 8);
+        if (args->bpp != 32)
+                return -EINVAL;
+
+        pitch = args->width * 4;
         args->size = pitch * args->height;
         args->size = ALIGN(args->size, PAGE_SIZE);
 
@@ -99,7 +102,7 @@ int virtio_gpu_mode_dumb_create(struct drm_file *file_priv,
         if (ret)
                 goto fail;
 
-        format = virtio_gpu_translate_format(DRM_FORMAT_XRGB8888);
+        format = virtio_gpu_translate_format(DRM_FORMAT_HOST_XRGB8888);
         virtio_gpu_resource_id_get(vgdev, &resid);
         virtio_gpu_cmd_create_resource(vgdev, resid, format,
                                        args->width, args->height);
diff --git a/drivers/gpu/drm/virtio/virtgpu_ioctl.c b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
index 7bdf6f0e58a5..f16b875d6a46 100644
--- a/drivers/gpu/drm/virtio/virtgpu_ioctl.c
+++ b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
@@ -429,11 +429,11 @@ static int virtio_gpu_transfer_to_host_ioctl(struct drm_device *dev, void *data,
         convert_to_hw_box(&box, &args->box);
         if (!vgdev->has_virgl_3d) {
                 virtio_gpu_cmd_transfer_to_host_2d
-                        (vgdev, qobj->hw_res_handle, offset,
+                        (vgdev, qobj, offset,
                          box.w, box.h, box.x, box.y, NULL);
         } else {
                 virtio_gpu_cmd_transfer_to_host_3d
-                        (vgdev, qobj->hw_res_handle,
+                        (vgdev, qobj,
                          vfpriv ? vfpriv->ctx_id : 0, offset,
                          args->level, &box, &fence);
                 reservation_object_add_excl_fence(qobj->tbo.resv,
diff --git a/drivers/gpu/drm/virtio/virtgpu_object.c b/drivers/gpu/drm/virtio/virtgpu_object.c
index 9f2f470efd9b..eca765537470 100644
--- a/drivers/gpu/drm/virtio/virtgpu_object.c
+++ b/drivers/gpu/drm/virtio/virtgpu_object.c
@@ -37,6 +37,8 @@ static void virtio_gpu_ttm_bo_destroy(struct ttm_buffer_object *tbo)
                 virtio_gpu_cmd_unref_resource(vgdev, bo->hw_res_handle);
         if (bo->pages)
                 virtio_gpu_object_free_sg_table(bo);
+        if (bo->vmap)
+                virtio_gpu_object_kunmap(bo);
         drm_gem_object_release(&bo->gem_base);
         kfree(bo);
 }
@@ -99,22 +101,23 @@ int virtio_gpu_object_create(struct virtio_gpu_device *vgdev,
         return 0;
 }
 
-int virtio_gpu_object_kmap(struct virtio_gpu_object *bo, void **ptr)
+void virtio_gpu_object_kunmap(struct virtio_gpu_object *bo)
+{
+        bo->vmap = NULL;
+        ttm_bo_kunmap(&bo->kmap);
+}
+
+int virtio_gpu_object_kmap(struct virtio_gpu_object *bo)
 {
         bool is_iomem;
         int r;
 
-        if (bo->vmap) {
-                if (ptr)
-                        *ptr = bo->vmap;
-                return 0;
-        }
+        WARN_ON(bo->vmap);
+
         r = ttm_bo_kmap(&bo->tbo, 0, bo->tbo.num_pages, &bo->kmap);
         if (r)
                 return r;
         bo->vmap = ttm_kmap_obj_virtual(&bo->kmap, &is_iomem);
-        if (ptr)
-                *ptr = bo->vmap;
         return 0;
 }
 
diff --git a/drivers/gpu/drm/virtio/virtgpu_plane.c b/drivers/gpu/drm/virtio/virtgpu_plane.c
index 88f2fb8c61c4..a9f4ae7d4483 100644
--- a/drivers/gpu/drm/virtio/virtgpu_plane.c
+++ b/drivers/gpu/drm/virtio/virtgpu_plane.c
@@ -28,22 +28,11 @@
 #include <drm/drm_atomic_helper.h>
 
 static const uint32_t virtio_gpu_formats[] = {
-        DRM_FORMAT_XRGB8888,
-        DRM_FORMAT_ARGB8888,
-        DRM_FORMAT_BGRX8888,
-        DRM_FORMAT_BGRA8888,
-        DRM_FORMAT_RGBX8888,
-        DRM_FORMAT_RGBA8888,
-        DRM_FORMAT_XBGR8888,
-        DRM_FORMAT_ABGR8888,
+        DRM_FORMAT_HOST_XRGB8888,
 };
 
 static const uint32_t virtio_gpu_cursor_formats[] = {
-#ifdef __BIG_ENDIAN
-        DRM_FORMAT_BGRA8888,
-#else
-        DRM_FORMAT_ARGB8888,
-#endif
+        DRM_FORMAT_HOST_ARGB8888,
 };
 
 uint32_t virtio_gpu_translate_format(uint32_t drm_fourcc)
@@ -51,32 +40,6 @@ uint32_t virtio_gpu_translate_format(uint32_t drm_fourcc)
         uint32_t format;
 
         switch (drm_fourcc) {
-#ifdef __BIG_ENDIAN
-        case DRM_FORMAT_XRGB8888:
-                format = VIRTIO_GPU_FORMAT_X8R8G8B8_UNORM;
-                break;
-        case DRM_FORMAT_ARGB8888:
-                format = VIRTIO_GPU_FORMAT_A8R8G8B8_UNORM;
-                break;
-        case DRM_FORMAT_BGRX8888:
-                format = VIRTIO_GPU_FORMAT_B8G8R8X8_UNORM;
-                break;
-        case DRM_FORMAT_BGRA8888:
-                format = VIRTIO_GPU_FORMAT_B8G8R8A8_UNORM;
-                break;
-        case DRM_FORMAT_RGBX8888:
-                format = VIRTIO_GPU_FORMAT_R8G8B8X8_UNORM;
-                break;
-        case DRM_FORMAT_RGBA8888:
-                format = VIRTIO_GPU_FORMAT_R8G8B8A8_UNORM;
-                break;
-        case DRM_FORMAT_XBGR8888:
-                format = VIRTIO_GPU_FORMAT_X8B8G8R8_UNORM;
-                break;
-        case DRM_FORMAT_ABGR8888:
-                format = VIRTIO_GPU_FORMAT_A8B8G8R8_UNORM;
-                break;
-#else
         case DRM_FORMAT_XRGB8888:
                 format = VIRTIO_GPU_FORMAT_B8G8R8X8_UNORM;
                 break;
@@ -89,19 +52,6 @@ uint32_t virtio_gpu_translate_format(uint32_t drm_fourcc)
         case DRM_FORMAT_BGRA8888:
                 format = VIRTIO_GPU_FORMAT_A8R8G8B8_UNORM;
                 break;
-        case DRM_FORMAT_RGBX8888:
-                format = VIRTIO_GPU_FORMAT_X8B8G8R8_UNORM;
-                break;
-        case DRM_FORMAT_RGBA8888:
-                format = VIRTIO_GPU_FORMAT_A8B8G8R8_UNORM;
-                break;
-        case DRM_FORMAT_XBGR8888:
-                format = VIRTIO_GPU_FORMAT_R8G8B8X8_UNORM;
-                break;
-        case DRM_FORMAT_ABGR8888:
-                format = VIRTIO_GPU_FORMAT_R8G8B8A8_UNORM;
-                break;
-#endif
         default:
                 /*
                  * This should not happen, we handle everything listed
@@ -158,7 +108,7 @@ static void virtio_gpu_primary_plane_update(struct drm_plane *plane,
                 handle = bo->hw_res_handle;
                 if (bo->dumb) {
                         virtio_gpu_cmd_transfer_to_host_2d
-                                (vgdev, handle, 0,
+                                (vgdev, bo, 0,
                                  cpu_to_le32(plane->state->src_w >> 16),
                                  cpu_to_le32(plane->state->src_h >> 16),
                                  cpu_to_le32(plane->state->src_x >> 16),
@@ -217,7 +167,7 @@ static void virtio_gpu_cursor_plane_update(struct drm_plane *plane,
         if (bo && bo->dumb && (plane->state->fb != old_state->fb)) {
                 /* new cursor -- update & wait */
                 virtio_gpu_cmd_transfer_to_host_2d
-                        (vgdev, handle, 0,
+                        (vgdev, bo, 0,
                          cpu_to_le32(plane->state->crtc_w),
                          cpu_to_le32(plane->state->crtc_h),
                          0, 0, &fence);
diff --git a/drivers/gpu/drm/virtio/virtgpu_prime.c b/drivers/gpu/drm/virtio/virtgpu_prime.c
index d27a1688714f..86ce0ae93f59 100644
--- a/drivers/gpu/drm/virtio/virtgpu_prime.c
+++ b/drivers/gpu/drm/virtio/virtgpu_prime.c
@@ -55,13 +55,18 @@ struct drm_gem_object *virtgpu_gem_prime_import_sg_table(
 
 void *virtgpu_gem_prime_vmap(struct drm_gem_object *obj)
 {
-        WARN_ONCE(1, "not implemented");
-        return ERR_PTR(-ENODEV);
+        struct virtio_gpu_object *bo = gem_to_virtio_gpu_obj(obj);
+        int ret;
+
+        ret = virtio_gpu_object_kmap(bo);
+        if (ret)
+                return NULL;
+        return bo->vmap;
 }
 
 void virtgpu_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr)
 {
-        WARN_ONCE(1, "not implemented");
+        virtio_gpu_object_kunmap(gem_to_virtio_gpu_obj(obj));
 }
 
 int virtgpu_gem_prime_mmap(struct drm_gem_object *obj,
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);