Signed-off-by: Gerd Hoffmann <kra...@redhat.com>
---
 drivers/gpu/drm/virtio/virtgpu_gem.c   |  2 +-
 drivers/gpu/drm/virtio/virtgpu_plane.c | 31 -------------------------------
 2 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/drivers/gpu/drm/virtio/virtgpu_gem.c 
b/drivers/gpu/drm/virtio/virtgpu_gem.c
index cc025d8fbe..4f2c2dc731 100644
--- a/drivers/gpu/drm/virtio/virtgpu_gem.c
+++ b/drivers/gpu/drm/virtio/virtgpu_gem.c
@@ -99,7 +99,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_CPU_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_plane.c 
b/drivers/gpu/drm/virtio/virtgpu_plane.c
index adcdbd0abe..f40ffc9a70 100644
--- a/drivers/gpu/drm/virtio/virtgpu_plane.c
+++ b/drivers/gpu/drm/virtio/virtgpu_plane.c
@@ -39,11 +39,7 @@ static const uint32_t virtio_gpu_formats[] = {
 };
 
 static const uint32_t virtio_gpu_cursor_formats[] = {
-#ifdef __BIG_ENDIAN
-       DRM_FORMAT_BGRA8888,
-#else
        DRM_FORMAT_ARGB8888,
-#endif
 };
 
 uint32_t virtio_gpu_translate_format(uint32_t drm_fourcc)
@@ -51,32 +47,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;
@@ -101,7 +71,6 @@ uint32_t virtio_gpu_translate_format(uint32_t drm_fourcc)
        case DRM_FORMAT_ABGR8888:
                format = VIRTIO_GPU_FORMAT_R8G8B8A8_UNORM;
                break;
-#endif
        default:
                /*
                 * This should not happen, we handle everything listed
-- 
2.9.3

_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization

Reply via email to