Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp3944428yba; Wed, 17 Apr 2019 00:58:32 -0700 (PDT) X-Google-Smtp-Source: APXvYqwyKv+OU6100mgdmHbstvJeuEMhKpoM0MHE2L7sM9SKxlbrOINjrKko9pArc+y9C5TVMU4P X-Received: by 2002:a62:5f84:: with SMTP id t126mr87530636pfb.185.1555487912532; Wed, 17 Apr 2019 00:58:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555487912; cv=none; d=google.com; s=arc-20160816; b=qbTnq9rNrm+OrWx//k7/vjb3AxzhiU0Wn+Kq5VwYRj+Cf9jBsMDHD49qf2i9rAJyxe X5ySMrDIjkrJpL8nwdDmdEPnzHhAInkxOmkyW1QJbg9jDF3t4yTB28lr8PRTVYk8FbW8 BTDjzOXvQlL2HdPSQxKJ9hEX6yf5QOsRtxW/ndvXEjMfy/qSdepWXOqNJKz5w24+QeET PUnMUWNLMtqg8SL1VytxvC2ygNCTLXlBSNq9jOoT5Z0qvfviErb8yQkzIeLG7Zdhu+53 jRERIyQU5kzvLAwI33SDcPNyknM2ueKq9EsL6t52sxiXkhhmS78exb9xzS1ZxTKaQ0lE pTxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=edM5tIo4nKn/VKrv8k4j+GC2UCp2wavQCc3NFhhsqbI=; b=JOTzG8x81eVgOPbFnobuTlYCugibWGolSLFStYSDXUUsyOFZFCv+Z8uwCQqI+wTGM8 eHPyuxdOslUYPDP/4oN4TgY/oT5ZgOUKXHAD8KmxPNWlRwCNKxx2dNSZeG1VQ+VzsYaV oR97GDfYkTCqPYbqCl9yzCSAGPlfQGnOObhjDs8ggVsQUbnOPvxVJpiiLZHaw7AqK+yu ZyjHC3ot9RKpzZL4fgTzjiGHObfrEYwSt8bp3o08QnqHOzKlOYanaj2SzbX2/TVV+mAs XKAX2im5vvP3KpCBW7bQVtYpQTZpkS5dYVdwb8KcTvzIf7WtGgDULjsAFv4RwC8CT4uT jxsg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s18si49486781plq.244.2019.04.17.00.58.17; Wed, 17 Apr 2019 00:58:32 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731296AbfDQH4v (ORCPT + 99 others); Wed, 17 Apr 2019 03:56:51 -0400 Received: from relay2-d.mail.gandi.net ([217.70.183.194]:43695 "EHLO relay2-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731226AbfDQHzQ (ORCPT ); Wed, 17 Apr 2019 03:55:16 -0400 X-Originating-IP: 90.88.160.238 Received: from localhost (aaubervilliers-681-1-42-238.w90-88.abo.wanadoo.fr [90.88.160.238]) (Authenticated sender: maxime.ripard@bootlin.com) by relay2-d.mail.gandi.net (Postfix) with ESMTPSA id 6216640005; Wed, 17 Apr 2019 07:55:12 +0000 (UTC) From: Maxime Ripard To: Daniel Vetter , David Airlie , Maarten Lankhorst , Sean Paul , Maxime Ripard , Mauro Carvalho Chehab Cc: Sakari Ailus , Hans Verkuil , Laurent Pinchart , Thomas Petazzoni , Paul Kocialkowski , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 18/20] lib: image-formats: Add v4l2 formats support Date: Wed, 17 Apr 2019 09:54:44 +0200 Message-Id: X-Mailer: git-send-email 2.21.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org V4L2 uses different fourcc's than DRM, and has a different set of formats. For now, let's add the v4l2 fourcc's for the already existing formats. Signed-off-by: Maxime Ripard --- include/linux/image-formats.h | 9 +++++- lib/image-formats.c | 62 ++++++++++++++++++++++++++++++++++++- 2 files changed, 71 insertions(+) diff --git a/include/linux/image-formats.h b/include/linux/image-formats.h index ec43d9f9a527..b78b8e861fc9 100644 --- a/include/linux/image-formats.h +++ b/include/linux/image-formats.h @@ -50,6 +50,13 @@ struct image_format_info { }; /** + * @v4l2_fmt: + * + * V4L2 4CC format identifier (V4L2_PIX_FMT_*) + */ + u32 v4l2_fmt; + + /** * @depth: * * Color depth (number of bits per pixel excluding padding bits), @@ -382,6 +389,8 @@ uint64_t image_format_info_min_pitch(const struct image_format_info *info, } const struct image_format_info *__image_format_drm_lookup(u32 drm); +const struct image_format_info *__image_format_v4l2_lookup(u32 v4l2); const struct image_format_info *image_format_drm_lookup(u32 drm); +const struct image_format_info *image_format_v4l2_lookup(u32 v4l2); #endif /* _IMAGE_FORMATS_H_ */ diff --git a/lib/image-formats.c b/lib/image-formats.c index 1e52a7410222..25fa22d243fb 100644 --- a/lib/image-formats.c +++ b/lib/image-formats.c @@ -25,12 +25,14 @@ #include #include #include +#include #include static const struct image_format_info formats[] = { { .drm_fmt = DRM_FORMAT_C8, + .v4l2_fmt = V4L2_PIX_FMT_GREY, .depth = 8, .num_planes = 1, .cpp = { 1, 0, 0 }, @@ -38,6 +40,7 @@ static const struct image_format_info formats[] = { .vsub = 1, }, { .drm_fmt = DRM_FORMAT_RGB332, + .v4l2_fmt = V4L2_PIX_FMT_RGB332, .depth = 8, .num_planes = 1, .cpp = { 1, 0, 0 }, @@ -172,6 +175,7 @@ static const struct image_format_info formats[] = { .has_alpha = true, }, { .drm_fmt = DRM_FORMAT_RGB565, + .v4l2_fmt = V4L2_PIX_FMT_RGB565X, .depth = 16, .num_planes = 1, .cpp = { 2, 0, 0 }, @@ -186,6 +190,7 @@ static const struct image_format_info formats[] = { .vsub = 1, }, { .drm_fmt = DRM_FORMAT_RGB888, + .v4l2_fmt = V4L2_PIX_FMT_BGR24, .depth = 24, .num_planes = 1, .cpp = { 3, 0, 0 }, @@ -193,6 +198,7 @@ static const struct image_format_info formats[] = { .vsub = 1, }, { .drm_fmt = DRM_FORMAT_BGR888, + .v4l2_fmt = V4L2_PIX_FMT_RGB24, .depth = 24, .num_planes = 1, .cpp = { 3, 0, 0 }, @@ -200,6 +206,7 @@ static const struct image_format_info formats[] = { .vsub = 1, }, { .drm_fmt = DRM_FORMAT_XRGB8888, + .v4l2_fmt = V4L2_PIX_FMT_XBGR32, .depth = 24, .num_planes = 1, .cpp = { 4, 0, 0 }, @@ -304,6 +311,7 @@ static const struct image_format_info formats[] = { .has_alpha = true, }, { .drm_fmt = DRM_FORMAT_ARGB8888, + .v4l2_fmt = V4L2_PIX_FMT_ABGR32, .depth = 32, .num_planes = 1, .cpp = { 4, 0, 0 }, @@ -384,6 +392,7 @@ static const struct image_format_info formats[] = { .has_alpha = true, }, { .drm_fmt = DRM_FORMAT_YUV410, + .v4l2_fmt = V4L2_PIX_FMT_YUV410, .depth = 0, .num_planes = 3, .cpp = { 1, 1, 1 }, @@ -392,6 +401,7 @@ static const struct image_format_info formats[] = { .is_yuv = true, }, { .drm_fmt = DRM_FORMAT_YVU410, + .v4l2_fmt = V4L2_PIX_FMT_YVU410, .depth = 0, .num_planes = 3, .cpp = { 1, 1, 1 }, @@ -416,6 +426,7 @@ static const struct image_format_info formats[] = { .is_yuv = true, }, { .drm_fmt = DRM_FORMAT_YUV420, + .v4l2_fmt = V4L2_PIX_FMT_YUV420, .depth = 0, .num_planes = 3, .cpp = { 1, 1, 1 }, @@ -424,6 +435,7 @@ static const struct image_format_info formats[] = { .is_yuv = true, }, { .drm_fmt = DRM_FORMAT_YVU420, + .v4l2_fmt = V4L2_PIX_FMT_YVU420, .depth = 0, .num_planes = 3, .cpp = { 1, 1, 1 }, @@ -432,6 +444,7 @@ static const struct image_format_info formats[] = { .is_yuv = true, }, { .drm_fmt = DRM_FORMAT_YUV422, + .v4l2_fmt = V4L2_PIX_FMT_YUV422P, .depth = 0, .num_planes = 3, .cpp = { 1, 1, 1 }, @@ -448,6 +461,7 @@ static const struct image_format_info formats[] = { .is_yuv = true, }, { .drm_fmt = DRM_FORMAT_YUV444, + .v4l2_fmt = V4L2_PIX_FMT_YUV444, .depth = 0, .num_planes = 3, .cpp = { 1, 1, 1 }, @@ -464,6 +478,7 @@ static const struct image_format_info formats[] = { .is_yuv = true, }, { .drm_fmt = DRM_FORMAT_NV12, + .v4l2_fmt = V4L2_PIX_FMT_NV12, .depth = 0, .num_planes = 2, .cpp = { 1, 2, 0 }, @@ -472,6 +487,7 @@ static const struct image_format_info formats[] = { .is_yuv = true, }, { .drm_fmt = DRM_FORMAT_NV21, + .v4l2_fmt = V4L2_PIX_FMT_NV21, .depth = 0, .num_planes = 2, .cpp = { 1, 2, 0 }, @@ -480,6 +496,7 @@ static const struct image_format_info formats[] = { .is_yuv = true, }, { .drm_fmt = DRM_FORMAT_NV16, + .v4l2_fmt = V4L2_PIX_FMT_NV16, .depth = 0, .num_planes = 2, .cpp = { 1, 2, 0 }, @@ -488,6 +505,7 @@ static const struct image_format_info formats[] = { .is_yuv = true, }, { .drm_fmt = DRM_FORMAT_NV61, + .v4l2_fmt = V4L2_PIX_FMT_NV61, .depth = 0, .num_planes = 2, .cpp = { 1, 2, 0 }, @@ -496,6 +514,7 @@ static const struct image_format_info formats[] = { .is_yuv = true, }, { .drm_fmt = DRM_FORMAT_NV24, + .v4l2_fmt = V4L2_PIX_FMT_NV24, .depth = 0, .num_planes = 2, .cpp = { 1, 2, 0 }, @@ -504,6 +523,7 @@ static const struct image_format_info formats[] = { .is_yuv = true, }, { .drm_fmt = DRM_FORMAT_NV42, + .v4l2_fmt = V4L2_PIX_FMT_NV42, .depth = 0, .num_planes = 2, .cpp = { 1, 2, 0 }, @@ -512,6 +532,7 @@ static const struct image_format_info formats[] = { .is_yuv = true, }, { .drm_fmt = DRM_FORMAT_YUYV, + .v4l2_fmt = V4L2_PIX_FMT_YUYV, .depth = 0, .num_planes = 1, .cpp = { 2, 0, 0 }, @@ -520,6 +541,7 @@ static const struct image_format_info formats[] = { .is_yuv = true, }, { .drm_fmt = DRM_FORMAT_YVYU, + .v4l2_fmt = V4L2_PIX_FMT_YVYU, .depth = 0, .num_planes = 1, .cpp = { 2, 0, 0 }, @@ -528,6 +550,7 @@ static const struct image_format_info formats[] = { .is_yuv = true, }, { .drm_fmt = DRM_FORMAT_UYVY, + .v4l2_fmt = V4L2_PIX_FMT_UYVY, .depth = 0, .num_planes = 1, .cpp = { 2, 0, 0 }, @@ -536,6 +559,7 @@ static const struct image_format_info formats[] = { .is_yuv = true, }, { .drm_fmt = DRM_FORMAT_VYUY, + .v4l2_fmt = V4L2_PIX_FMT_VYUY, .depth = 0, .num_planes = 1, .cpp = { 2, 0, 0 }, @@ -653,3 +677,41 @@ const struct image_format_info *image_format_drm_lookup(u32 drm) return format; } EXPORT_SYMBOL(image_format_drm_lookup); + +/** + * __image_format_v4l2_lookup - query information for a given format + * @v4l2: V4L2 fourcc pixel format (V4L2_PIX_FMT_*) + * + * The caller should only pass a supported pixel format to this function. + * + * Returns: + * The instance of struct image_format_info that describes the pixel format, or + * NULL if the format is unsupported. + */ +const struct image_format_info *__image_format_v4l2_lookup(u32 v4l2) +{ + return __image_format_lookup(v4l2_fmt, v4l2); +} +EXPORT_SYMBOL(__image_format_v4l2_lookup); + +/** + * image_format_v4l2_lookup - query information for a given format + * @v4l2: V4L2 fourcc pixel format (V4L2_PIX_FMT_*) + * + * The caller should only pass a supported pixel format to this function. + * Unsupported pixel formats will generate a warning in the kernel log. + * + * Returns: + * The instance of struct image_format_info that describes the pixel format, or + * NULL if the format is unsupported. + */ +const struct image_format_info *image_format_v4l2_lookup(u32 v4l2) +{ + const struct image_format_info *format; + + format = __image_format_v4l2_lookup(v4l2); + + WARN_ON(!format); + return format; +} +EXPORT_SYMBOL(image_format_v4l2_lookup); -- git-series 0.9.1