gpu: ipu-v3: add support for RGBX8888 and RGBA8888 pixel formats

This patch adds support for the RGBA8888, RGBX8888, BGRA8888, and
BGRX8888 in-memory formats.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>

diff --git a/drivers/gpu/ipu-v3/ipu-cpmem.c b/drivers/gpu/ipu-v3/ipu-cpmem.c
index d26b8bee0269b2321ba533548e765907d3541f5d..0e6b8687c61a924c865a85df6341c346e3d911fc 100644 (file)
--- a/drivers/gpu/ipu-v3/ipu-cpmem.c
+++ b/drivers/gpu/ipu-v3/ipu-cpmem.c
@@ -452,7 +452,7 @@ void ipu_cpmem_set_yuv_planar(struct ipuv3_channel *ch,
 }
 EXPORT_SYMBOL_GPL(ipu_cpmem_set_yuv_planar);
 
-static const struct ipu_rgb def_rgb_32 = {
+static const struct ipu_rgb def_xrgb_32 = {
        .red    = { .offset = 16, .length = 8, },
        .green  = { .offset =  8, .length = 8, },
        .blue   = { .offset =  0, .length = 8, },
@@ -460,7 +460,7 @@ static const struct ipu_rgb def_rgb_32 = {
        .bits_per_pixel = 32,
 };
 
-static const struct ipu_rgb def_bgr_32 = {
+static const struct ipu_rgb def_xbgr_32 = {
        .red    = { .offset =  0, .length = 8, },
        .green  = { .offset =  8, .length = 8, },
        .blue   = { .offset = 16, .length = 8, },
@@ -468,6 +468,22 @@ static const struct ipu_rgb def_bgr_32 = {
        .bits_per_pixel = 32,
 };
 
+static const struct ipu_rgb def_rgbx_32 = {
+       .red    = { .offset = 24, .length = 8, },
+       .green  = { .offset = 16, .length = 8, },
+       .blue   = { .offset =  8, .length = 8, },
+       .transp = { .offset =  0, .length = 8, },
+       .bits_per_pixel = 32,
+};
+
+static const struct ipu_rgb def_bgrx_32 = {
+       .red    = { .offset =  8, .length = 8, },
+       .green  = { .offset = 16, .length = 8, },
+       .blue   = { .offset = 24, .length = 8, },
+       .transp = { .offset =  0, .length = 8, },
+       .bits_per_pixel = 32,
+};
+
 static const struct ipu_rgb def_rgb_24 = {
        .red    = { .offset = 16, .length = 8, },
        .green  = { .offset =  8, .length = 8, },
@@ -595,11 +611,19 @@ int ipu_cpmem_set_fmt(struct ipuv3_channel *ch, u32 drm_fourcc)
                break;
        case DRM_FORMAT_ABGR8888:
        case DRM_FORMAT_XBGR8888:
-               ipu_cpmem_set_format_rgb(ch, &def_bgr_32);
+               ipu_cpmem_set_format_rgb(ch, &def_xbgr_32);
                break;
        case DRM_FORMAT_ARGB8888:
        case DRM_FORMAT_XRGB8888:
-               ipu_cpmem_set_format_rgb(ch, &def_rgb_32);
+               ipu_cpmem_set_format_rgb(ch, &def_xrgb_32);
+               break;
+       case DRM_FORMAT_RGBA8888:
+       case DRM_FORMAT_RGBX8888:
+               ipu_cpmem_set_format_rgb(ch, &def_rgbx_32);
+               break;
+       case DRM_FORMAT_BGRA8888:
+       case DRM_FORMAT_BGRX8888:
+               ipu_cpmem_set_format_rgb(ch, &def_bgrx_32);
                break;
        case DRM_FORMAT_BGR888:
                ipu_cpmem_set_format_rgb(ch, &def_bgr_24);