Merge tag 'usercopy-v5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux

[linux.git] / drivers / gpu / ipu-v3 / ipu-common.c

diff --git a/drivers/gpu/ipu-v3/ipu-common.c b/drivers/gpu/ipu-v3/ipu-common.c
index 6386e2fe2ff73a85bd03844b84f5357bcf828ec7..ee2a025e54cfea007c55c304ae90dba22062e373 100644 (file)
--- a/drivers/gpu/ipu-v3/ipu-common.c
+++ b/drivers/gpu/ipu-v3/ipu-common.c
@@ -113,13 +113,17 @@ 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:
-       case V4L2_PIX_FMT_BGR24:
        case V4L2_PIX_FMT_RGB565:
+       case V4L2_PIX_FMT_BGR24:
+       case V4L2_PIX_FMT_RGB24:
+       case V4L2_PIX_FMT_ABGR32:
+       case V4L2_PIX_FMT_XBGR32:
+       case V4L2_PIX_FMT_BGRA32:
+       case V4L2_PIX_FMT_BGRX32:
+       case V4L2_PIX_FMT_RGBA32:
+       case V4L2_PIX_FMT_RGBX32:
+       case V4L2_PIX_FMT_ARGB32:
+       case V4L2_PIX_FMT_XRGB32:
                return IPUV3_COLORSPACE_RGB;
        default:
                return IPUV3_COLORSPACE_UNKNOWN;