Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1382BC2BA15 for ; Sun, 5 Apr 2020 17:10:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BEDF920659 for ; Sun, 5 Apr 2020 17:10:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="Vv7elQBM" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726830AbgDERKq (ORCPT ); Sun, 5 Apr 2020 13:10:46 -0400 Received: from perceval.ideasonboard.com ([213.167.242.64]:58312 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726771AbgDERKq (ORCPT ); Sun, 5 Apr 2020 13:10:46 -0400 Received: from pendragon.ideasonboard.com (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 9142F312; Sun, 5 Apr 2020 19:10:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1586106643; bh=9K2l+A8GO3OQFF49lCNw1HekeiIHXSjbS3m2LqELBlQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Vv7elQBM+p5fyYJA7+1ATtLQxRl6wocpa3h14ItlLnaOXmy0HqHlBXqnu5UP9aK7L Pkkn2t0vZuQGgI1hkp0gfFDh2/DYRnLqJ9VMwlZwn5rcWu8qbmasLMfH1lVmQPbN0u lkhqE5VBrsl17/2QLc/M4n/eIc/CByF7TJEwg4QE= Date: Sun, 5 Apr 2020 20:10:33 +0300 From: Laurent Pinchart To: Steve Longerbeam Cc: linux-media@vger.kernel.org, Philipp Zabel , Rui Miguel Silva Subject: Re: [PATCH v6 07/11] media: imx: utils: Make imx_media_pixfmt handle variable number of codes Message-ID: <20200405171033.GD5846@pendragon.ideasonboard.com> References: <20200404224130.23118-1-slongerbeam@gmail.com> <20200404224130.23118-8-slongerbeam@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20200404224130.23118-8-slongerbeam@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Hi Steve, Thank you for the patch. On Sat, Apr 04, 2020 at 03:41:26PM -0700, Steve Longerbeam wrote: > From: Laurent Pinchart > > The imx_media_pixfmt structures include a codes member that stores > media bus codes as a fixed array of 4 integers. The functions dealing > with the imx_media_pixfmt structures assume that the array of codes is > terminated by a 0 element. This mechanism is fragile, as demonstrated > by several instances of the structure containing 4 non-zero codes. > > Fix this by turning the array into a pointer, and providing an > IMX_BUS_FMTS macro to initialize the codes member with a guaranteed 0 > element at the end. > > Signed-off-by: Laurent Pinchart > > [Fixed a NULL deref of the codes pointer in a couple places] > [Added more comments for the struct imx_media_pixfmt members, > includung a bold NOTE! for future developers that codes pointer s/includung/including/ > is NULL for the in-memory-only formats] > > Signed-off-by: Steve Longerbeam Reviewed-by: Laurent Pinchart > --- > drivers/staging/media/imx/imx-media-capture.c | 4 +- > drivers/staging/media/imx/imx-media-utils.c | 74 ++++++++++--------- > drivers/staging/media/imx/imx-media.h | 7 +- > 3 files changed, 46 insertions(+), 39 deletions(-) > > diff --git a/drivers/staging/media/imx/imx-media-capture.c b/drivers/staging/media/imx/imx-media-capture.c > index ac48cbe35323..32d5b05097a9 100644 > --- a/drivers/staging/media/imx/imx-media-capture.c > +++ b/drivers/staging/media/imx/imx-media-capture.c > @@ -95,7 +95,7 @@ static int capture_enum_framesizes(struct file *file, void *fh, > if (!cc) > return -EINVAL; > > - fse.code = cc->codes[0]; > + fse.code = cc->codes ? cc->codes[0] : 0; > > ret = v4l2_subdev_call(priv->src_sd, pad, enum_frame_size, NULL, &fse); > if (ret) > @@ -137,7 +137,7 @@ static int capture_enum_frameintervals(struct file *file, void *fh, > if (!cc) > return -EINVAL; > > - fie.code = cc->codes[0]; > + fie.code = cc->codes ? cc->codes[0] : 0; > > ret = v4l2_subdev_call(priv->src_sd, pad, enum_frame_interval, > NULL, &fie); > diff --git a/drivers/staging/media/imx/imx-media-utils.c b/drivers/staging/media/imx/imx-media-utils.c > index 873fdcee7d37..bd8ebbf0b26d 100644 > --- a/drivers/staging/media/imx/imx-media-utils.c > +++ b/drivers/staging/media/imx/imx-media-utils.c > @@ -7,6 +7,8 @@ > #include > #include "imx-media.h" > > +#define IMX_BUS_FMTS(fmt...) (const u32[]) {fmt, 0} > + > /* > * List of supported pixel formats for the subdevs. > */ > @@ -14,18 +16,18 @@ static const struct imx_media_pixfmt pixel_formats[] = { > /*** YUV formats start here ***/ > { > .fourcc = V4L2_PIX_FMT_UYVY, > - .codes = { > + .codes = IMX_BUS_FMTS( > MEDIA_BUS_FMT_UYVY8_2X8, > MEDIA_BUS_FMT_UYVY8_1X16 > - }, > + ), > .cs = IPUV3_COLORSPACE_YUV, > .bpp = 16, > }, { > .fourcc = V4L2_PIX_FMT_YUYV, > - .codes = { > + .codes = IMX_BUS_FMTS( > MEDIA_BUS_FMT_YUYV8_2X8, > MEDIA_BUS_FMT_YUYV8_1X16 > - }, > + ), > .cs = IPUV3_COLORSPACE_YUV, > .bpp = 16, > }, { > @@ -55,7 +57,7 @@ static const struct imx_media_pixfmt pixel_formats[] = { > .planar = true, > }, { > .fourcc = V4L2_PIX_FMT_YUV32, > - .codes = {MEDIA_BUS_FMT_AYUV8_1X32}, > + .codes = IMX_BUS_FMTS(MEDIA_BUS_FMT_AYUV8_1X32), > .cs = IPUV3_COLORSPACE_YUV, > .bpp = 32, > .ipufmt = true, > @@ -63,16 +65,16 @@ static const struct imx_media_pixfmt pixel_formats[] = { > /*** RGB formats start here ***/ > { > .fourcc = V4L2_PIX_FMT_RGB565, > - .codes = {MEDIA_BUS_FMT_RGB565_2X8_LE}, > + .codes = IMX_BUS_FMTS(MEDIA_BUS_FMT_RGB565_2X8_LE), > .cs = IPUV3_COLORSPACE_RGB, > .bpp = 16, > .cycles = 2, > }, { > .fourcc = V4L2_PIX_FMT_RGB24, > - .codes = { > + .codes = IMX_BUS_FMTS( > MEDIA_BUS_FMT_RGB888_1X24, > MEDIA_BUS_FMT_RGB888_2X12_LE > - }, > + ), > .cs = IPUV3_COLORSPACE_RGB, > .bpp = 24, > }, { > @@ -81,12 +83,12 @@ static const struct imx_media_pixfmt pixel_formats[] = { > .bpp = 24, > }, { > .fourcc = V4L2_PIX_FMT_XRGB32, > - .codes = {MEDIA_BUS_FMT_ARGB8888_1X32}, > + .codes = IMX_BUS_FMTS(MEDIA_BUS_FMT_ARGB8888_1X32), > .cs = IPUV3_COLORSPACE_RGB, > .bpp = 32, > }, { > .fourcc = V4L2_PIX_FMT_XRGB32, > - .codes = {MEDIA_BUS_FMT_ARGB8888_1X32}, > + .codes = IMX_BUS_FMTS(MEDIA_BUS_FMT_ARGB8888_1X32), > .cs = IPUV3_COLORSPACE_RGB, > .bpp = 32, > .ipufmt = true, > @@ -106,91 +108,91 @@ static const struct imx_media_pixfmt pixel_formats[] = { > /*** raw bayer and grayscale formats start here ***/ > { > .fourcc = V4L2_PIX_FMT_SBGGR8, > - .codes = {MEDIA_BUS_FMT_SBGGR8_1X8}, > + .codes = IMX_BUS_FMTS(MEDIA_BUS_FMT_SBGGR8_1X8), > .cs = IPUV3_COLORSPACE_RGB, > .bpp = 8, > .bayer = true, > }, { > .fourcc = V4L2_PIX_FMT_SGBRG8, > - .codes = {MEDIA_BUS_FMT_SGBRG8_1X8}, > + .codes = IMX_BUS_FMTS(MEDIA_BUS_FMT_SGBRG8_1X8), > .cs = IPUV3_COLORSPACE_RGB, > .bpp = 8, > .bayer = true, > }, { > .fourcc = V4L2_PIX_FMT_SGRBG8, > - .codes = {MEDIA_BUS_FMT_SGRBG8_1X8}, > + .codes = IMX_BUS_FMTS(MEDIA_BUS_FMT_SGRBG8_1X8), > .cs = IPUV3_COLORSPACE_RGB, > .bpp = 8, > .bayer = true, > }, { > .fourcc = V4L2_PIX_FMT_SRGGB8, > - .codes = {MEDIA_BUS_FMT_SRGGB8_1X8}, > + .codes = IMX_BUS_FMTS(MEDIA_BUS_FMT_SRGGB8_1X8), > .cs = IPUV3_COLORSPACE_RGB, > .bpp = 8, > .bayer = true, > }, { > .fourcc = V4L2_PIX_FMT_SBGGR16, > - .codes = { > + .codes = IMX_BUS_FMTS( > MEDIA_BUS_FMT_SBGGR10_1X10, > MEDIA_BUS_FMT_SBGGR12_1X12, > MEDIA_BUS_FMT_SBGGR14_1X14, > MEDIA_BUS_FMT_SBGGR16_1X16 > - }, > + ), > .cs = IPUV3_COLORSPACE_RGB, > .bpp = 16, > .bayer = true, > }, { > .fourcc = V4L2_PIX_FMT_SGBRG16, > - .codes = { > + .codes = IMX_BUS_FMTS( > MEDIA_BUS_FMT_SGBRG10_1X10, > MEDIA_BUS_FMT_SGBRG12_1X12, > MEDIA_BUS_FMT_SGBRG14_1X14, > - MEDIA_BUS_FMT_SGBRG16_1X16, > - }, > + MEDIA_BUS_FMT_SGBRG16_1X16 > + ), > .cs = IPUV3_COLORSPACE_RGB, > .bpp = 16, > .bayer = true, > }, { > .fourcc = V4L2_PIX_FMT_SGRBG16, > - .codes = { > + .codes = IMX_BUS_FMTS( > MEDIA_BUS_FMT_SGRBG10_1X10, > MEDIA_BUS_FMT_SGRBG12_1X12, > MEDIA_BUS_FMT_SGRBG14_1X14, > - MEDIA_BUS_FMT_SGRBG16_1X16, > - }, > + MEDIA_BUS_FMT_SGRBG16_1X16 > + ), > .cs = IPUV3_COLORSPACE_RGB, > .bpp = 16, > .bayer = true, > }, { > .fourcc = V4L2_PIX_FMT_SRGGB16, > - .codes = { > + .codes = IMX_BUS_FMTS( > MEDIA_BUS_FMT_SRGGB10_1X10, > MEDIA_BUS_FMT_SRGGB12_1X12, > MEDIA_BUS_FMT_SRGGB14_1X14, > - MEDIA_BUS_FMT_SRGGB16_1X16, > - }, > + MEDIA_BUS_FMT_SRGGB16_1X16 > + ), > .cs = IPUV3_COLORSPACE_RGB, > .bpp = 16, > .bayer = true, > }, { > .fourcc = V4L2_PIX_FMT_GREY, > - .codes = { > + .codes = IMX_BUS_FMTS( > MEDIA_BUS_FMT_Y8_1X8, > MEDIA_BUS_FMT_Y10_1X10, > - MEDIA_BUS_FMT_Y12_1X12, > - }, > + MEDIA_BUS_FMT_Y12_1X12 > + ), > .cs = IPUV3_COLORSPACE_RGB, > .bpp = 8, > .bayer = true, > }, { > .fourcc = V4L2_PIX_FMT_Y10, > - .codes = {MEDIA_BUS_FMT_Y10_1X10}, > + .codes = IMX_BUS_FMTS(MEDIA_BUS_FMT_Y10_1X10), > .cs = IPUV3_COLORSPACE_RGB, > .bpp = 16, > .bayer = true, > }, { > .fourcc = V4L2_PIX_FMT_Y12, > - .codes = {MEDIA_BUS_FMT_Y12_1X12}, > + .codes = IMX_BUS_FMTS(MEDIA_BUS_FMT_Y12_1X12), > .cs = IPUV3_COLORSPACE_RGB, > .bpp = 16, > .bayer = true, > @@ -220,16 +222,16 @@ static const struct imx_media_pixfmt *find_format(u32 fourcc, > PIXFMT_SEL_YUV : PIXFMT_SEL_RGB); > > if (!(fmt_sel & sel) || > - (!allow_non_mbus && !fmt->codes[0])) > + (!allow_non_mbus && !fmt->codes)) > continue; > > if (fourcc && fmt->fourcc == fourcc) > return fmt; > > - if (!code) > + if (!code || !fmt->codes) > continue; > > - for (j = 0; j < ARRAY_SIZE(fmt->codes) && fmt->codes[j]; j++) { > + for (j = 0; fmt->codes[j]; j++) { > if (code == fmt->codes[j]) > return fmt; > } > @@ -260,7 +262,7 @@ static int enum_format(u32 *fourcc, u32 *code, u32 index, > PIXFMT_SEL_YUV : PIXFMT_SEL_RGB); > > if (!(fmt_sel & sel) || > - (!allow_non_mbus && !fmt->codes[0])) > + (!allow_non_mbus && !fmt->codes)) > continue; > > if (fourcc && index == 0) { > @@ -273,7 +275,7 @@ static int enum_format(u32 *fourcc, u32 *code, u32 index, > continue; > } > > - for (j = 0; j < ARRAY_SIZE(fmt->codes) && fmt->codes[j]; j++) { > + for (j = 0; fmt->codes[j]; j++) { > if (index == 0) { > *code = fmt->codes[j]; > return 0; > @@ -529,7 +531,7 @@ int imx_media_ipu_image_to_mbus_fmt(struct v4l2_mbus_framefmt *mbus, > const struct imx_media_pixfmt *fmt; > > fmt = imx_media_find_format(image->pix.pixelformat, PIXFMT_SEL_ANY); > - if (!fmt) > + if (!fmt || !fmt->codes || !fmt->codes[0]) > return -EINVAL; > > memset(mbus, 0, sizeof(*mbus)); > diff --git a/drivers/staging/media/imx/imx-media.h b/drivers/staging/media/imx/imx-media.h > index c61592750729..459ec15bcdaf 100644 > --- a/drivers/staging/media/imx/imx-media.h > +++ b/drivers/staging/media/imx/imx-media.h > @@ -68,8 +68,13 @@ enum { > #define IMX_MEDIA_EOF_TIMEOUT 1000 > > struct imx_media_pixfmt { > + /* the in-memory FourCC pixel format */ > u32 fourcc; > - u32 codes[4]; > + /* > + * the set of equivalent media bus codes for the fourcc. > + * NOTE! codes pointer is NULL for in-memory-only formats. > + */ > + const u32 *codes; > int bpp; /* total bpp */ > /* cycles per pixel for generic (bayer) formats for the parallel bus */ > int cycles; -- Regards, Laurent Pinchart