Merge tag 'imx-drm-fixes-2018-08-03' of git://git.pengutronix.de/git/pza/linux into...

[platform/kernel/linux-starfive.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 c73bd00..474b00e 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;