drm/vkms: Add support for ABGR8888 pixel format

Add support for pixel format ABGR8888, which is the default format
on Android devices. This will allow us to use VKMS as the default
display driver in Android Emulator (Cuttlefish) and increase VKMS
adoption.

Signed-off-by: Paz Zcharya <pazz@chromium.org>
Reviewed-by: Louis Chauvet <louis.chauvet@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250129142238.562999-1-pazz@google.com
Signed-off-by: Louis Chauvet <louis.chauvet@bootlin.com>

diff --git a/drivers/gpu/drm/vkms/vkms_formats.c b/drivers/gpu/drm/vkms/vkms_formats.c
index 39b1d7c97d454dfa1420990d35e455ed47e57c0c..30a64ecca87cfe044a057cdbbee842127c36708b 100644 (file)
--- a/drivers/gpu/drm/vkms/vkms_formats.c
+++ b/drivers/gpu/drm/vkms/vkms_formats.c
@@ -253,6 +253,26 @@ static void XRGB8888_read_line(const struct vkms_plane_state *plane, int x_start
        }
 }
 
+static void ABGR8888_read_line(const struct vkms_plane_state *plane, int x_start, int y_start,
+                              enum pixel_read_direction direction, int count,
+                              struct pixel_argb_u16 out_pixel[])
+{
+       struct pixel_argb_u16 *end = out_pixel + count;
+       u8 *src_pixels;
+
+       packed_pixels_addr_1x1(plane->frame_info, x_start, y_start, 0, &src_pixels);
+
+       int step = get_block_step_bytes(plane->frame_info->fb, direction, 0);
+
+       while (out_pixel < end) {
+               u8 *px = (u8 *)src_pixels;
+               /* Switch blue and red pixels. */
+               *out_pixel = argb_u16_from_u8888(px[3], px[0], px[1], px[2]);
+               out_pixel += 1;
+               src_pixels += step;
+       }
+}
+
 static void ARGB16161616_read_line(const struct vkms_plane_state *plane, int x_start,
                                   int y_start, enum pixel_read_direction direction, int count,
                                   struct pixel_argb_u16 out_pixel[])
@@ -344,6 +364,14 @@ static void argb_u16_to_XRGB8888(u8 *out_pixel, const struct pixel_argb_u16 *in_
        out_pixel[0] = DIV_ROUND_CLOSEST(in_pixel->b, 257);
 }
 
+static void argb_u16_to_ABGR8888(u8 *out_pixel, const struct pixel_argb_u16 *in_pixel)
+{
+       out_pixel[3] = DIV_ROUND_CLOSEST(in_pixel->a, 257);
+       out_pixel[2] = DIV_ROUND_CLOSEST(in_pixel->b, 257);
+       out_pixel[1] = DIV_ROUND_CLOSEST(in_pixel->g, 257);
+       out_pixel[0] = DIV_ROUND_CLOSEST(in_pixel->r, 257);
+}
+
 static void argb_u16_to_ARGB16161616(u8 *out_pixel, const struct pixel_argb_u16 *in_pixel)
 {
        __le16 *pixel = (__le16 *)out_pixel;
@@ -420,6 +448,8 @@ pixel_read_line_t get_pixel_read_line_function(u32 format)
                return &ARGB8888_read_line;
        case DRM_FORMAT_XRGB8888:
                return &XRGB8888_read_line;
+       case DRM_FORMAT_ABGR8888:
+               return &ABGR8888_read_line;
        case DRM_FORMAT_ARGB16161616:
                return &ARGB16161616_read_line;
        case DRM_FORMAT_XRGB16161616:
@@ -453,6 +483,8 @@ pixel_write_t get_pixel_write_function(u32 format)
                return &argb_u16_to_ARGB8888;
        case DRM_FORMAT_XRGB8888:
                return &argb_u16_to_XRGB8888;
+       case DRM_FORMAT_ABGR8888:
+               return &argb_u16_to_ABGR8888;
        case DRM_FORMAT_ARGB16161616:
                return &argb_u16_to_ARGB16161616;
        case DRM_FORMAT_XRGB16161616:

diff --git a/drivers/gpu/drm/vkms/vkms_plane.c b/drivers/gpu/drm/vkms/vkms_plane.c
index e2fce471870f1899f2ccb66b339ce8c4332cc287..e34f8c7f83c3ad21983c61056bdbdfad6bf53010 100644 (file)
--- a/drivers/gpu/drm/vkms/vkms_plane.c
+++ b/drivers/gpu/drm/vkms/vkms_plane.c
@@ -15,6 +15,7 @@
 static const u32 vkms_formats[] = {
        DRM_FORMAT_ARGB8888,
        DRM_FORMAT_XRGB8888,
+       DRM_FORMAT_ABGR8888,
        DRM_FORMAT_XRGB16161616,
        DRM_FORMAT_ARGB16161616,
        DRM_FORMAT_RGB565

diff --git a/drivers/gpu/drm/vkms/vkms_writeback.c b/drivers/gpu/drm/vkms/vkms_writeback.c
index e9b5c74d7c58e7faed870a4368decbd67dab23d2..fe163271d5b5e867a11cbada58c8dde5070ac443 100644 (file)
--- a/drivers/gpu/drm/vkms/vkms_writeback.c
+++ b/drivers/gpu/drm/vkms/vkms_writeback.c
@@ -17,6 +17,7 @@
 static const u32 vkms_wb_formats[] = {
        DRM_FORMAT_ARGB8888,
        DRM_FORMAT_XRGB8888,
+       DRM_FORMAT_ABGR8888,
        DRM_FORMAT_XRGB16161616,
        DRM_FORMAT_ARGB16161616,
        DRM_FORMAT_RGB565