1 files changed, 4 insertions, 54 deletions

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);