gpu: ipu-v3: add support for XRGB32 and XBGR32 V4L2 pixel formats

These should be used instead of the ill-defined deprecated RGB32 and
BGR32 V4L2 pixel formats.

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

diff --git a/drivers/gpu/ipu-v3/ipu-common.c b/drivers/gpu/ipu-v3/ipu-common.c
index 48685cddbad1b7218519841c58478e12333bb90e..66e9405faedc7d1933456e3b1c20a85335c6f5e7 100644 (file)
--- a/drivers/gpu/ipu-v3/ipu-common.c
+++ b/drivers/gpu/ipu-v3/ipu-common.c
@@ -122,6 +122,8 @@ enum ipu_color_space ipu_pixelformat_to_colorspace(u32 pixelformat)
        case V4L2_PIX_FMT_NV16:
        case V4L2_PIX_FMT_NV61:
                return IPUV3_COLORSPACE_YUV;
+       case V4L2_PIX_FMT_XRGB32:
+       case V4L2_PIX_FMT_XBGR32:
        case V4L2_PIX_FMT_RGB32:
        case V4L2_PIX_FMT_BGR32:
        case V4L2_PIX_FMT_RGB24:
@@ -190,6 +192,8 @@ int ipu_stride_to_bytes(u32 pixel_stride, u32 pixelformat)
                return (24 * pixel_stride) >> 3;
        case V4L2_PIX_FMT_BGR32:
        case V4L2_PIX_FMT_RGB32:
+       case V4L2_PIX_FMT_XBGR32:
+       case V4L2_PIX_FMT_XRGB32:
                return (32 * pixel_stride) >> 3;
        default:
                break;

diff --git a/drivers/gpu/ipu-v3/ipu-cpmem.c b/drivers/gpu/ipu-v3/ipu-cpmem.c
index 125721a7f8b6d7b2ac9a3217a954551751054be0..0f1155ea0fbd2989542fddd76e16adff280e8093 100644 (file)
--- a/drivers/gpu/ipu-v3/ipu-cpmem.c
+++ b/drivers/gpu/ipu-v3/ipu-cpmem.c
@@ -188,6 +188,12 @@ static int v4l2_pix_fmt_to_drm_fourcc(u32 pixelformat)
        case V4L2_PIX_FMT_RGB32:
                /* R G B A <=> [32:0] A:B:G:R */
                return DRM_FORMAT_XBGR8888;
+       case V4L2_PIX_FMT_XBGR32:
+               /* B G R X <=> [32:0] X:R:G:B */
+               return DRM_FORMAT_XRGB8888;
+       case V4L2_PIX_FMT_XRGB32:
+               /* X R G B <=> [32:0] B:G:R:X */
+               return DRM_FORMAT_BGRX8888;
        case V4L2_PIX_FMT_UYVY:
                return DRM_FORMAT_UYVY;
        case V4L2_PIX_FMT_YUYV:
@@ -787,6 +793,8 @@ int ipu_cpmem_set_image(struct ipuv3_channel *ch, struct ipu_image *image)
                break;
        case V4L2_PIX_FMT_RGB32:
        case V4L2_PIX_FMT_BGR32:
+       case V4L2_PIX_FMT_XRGB32:
+       case V4L2_PIX_FMT_XBGR32:
                offset = image->rect.left * 4 +
                        image->rect.top * pix->bytesperline;
                break;

diff --git a/drivers/gpu/ipu-v3/ipu-image-convert.c b/drivers/gpu/ipu-v3/ipu-image-convert.c
index 524a717ab28e4937cf120a18f942e2a04f3c216d..f4081962784ccee322282a5099590c42dcbcccc9 100644 (file)
--- a/drivers/gpu/ipu-v3/ipu-image-convert.c
+++ b/drivers/gpu/ipu-v3/ipu-image-convert.c
@@ -226,6 +226,12 @@ static const struct ipu_image_pixfmt image_convert_formats[] = {
        }, {
                .fourcc = V4L2_PIX_FMT_BGR32,
                .bpp    = 32,
+       }, {
+               .fourcc = V4L2_PIX_FMT_XRGB32,
+               .bpp    = 32,
+       }, {
+               .fourcc = V4L2_PIX_FMT_XBGR32,
+               .bpp    = 32,
        }, {
                .fourcc = V4L2_PIX_FMT_YUYV,
                .bpp    = 16,