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;
Subject: Re: [PATCH 1/2] media: vimc: get pixformat info from v4l2_format_info
 to avoid code repetition
To:     =?UTF-8?Q?Carlos_Eduardo_Cl=c3=admaco_Barbosa?= 
        <climacobarbosacee@gmail.com>,
        Mauro Carvalho Chehab <mchehab@kernel.org>,
        linux-media@vger.kernel.org, linux-kernel@vger.kernel.org
References: <CACViCuVVe6Jcy=0OnFTFFS6sGyhOx0WnpTR-8nRmvqf2JyiDww@mail.gmail.com>
From:   Helen Koike <helen.koike@collabora.com>
Openpgp: preference=signencrypt
Autocrypt: addr=helen.koike@collabora.com; keydata=
 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
Message-ID: <cbac9828-6e8c-8b04-d3d8-c687ed2ca905@collabora.com>
Date:   Thu, 3 Oct 2019 16:40:14 -0300
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101
 Thunderbird/60.7.2
MIME-Version: 1.0
In-Reply-To: <CACViCuVVe6Jcy=0OnFTFFS6sGyhOx0WnpTR-8nRmvqf2JyiDww@mail.gmail.com>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 8bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Hi Carlos,

On 10/3/19 4:10 PM, Carlos Eduardo Clímaco Barbosa wrote:
> As the info found in vim_pix_map members are already available in
> v4l2_format_info so those were removed to optimize the code and their
> calls were remapped to matching ones.

Thanks for the patch, but the patch format is broken and I'm not able to
apply it :(
I recommend using git send-email or some email client that doesn't mess
up with the formatting.

Before re-sending the patch, please make sure you are able to send in the
correct format first to yourself, and that you are able to apply the email
from the mailing list on top or media/master.

Feel free to contact me directly if you want help with this.

Regards,
Helen

> ---
>  drivers/media/platform/vimc/vimc-capture.c |  8 +++-
>  drivers/media/platform/vimc/vimc-common.c  | 46 ----------------------
>  drivers/media/platform/vimc/vimc-common.h  |  2 -
>  drivers/media/platform/vimc/vimc-debayer.c |  6 ++-
>  drivers/media/platform/vimc/vimc-scaler.c  | 20 +++++++---
>  drivers/media/platform/vimc/vimc-sensor.c  |  8 +++-
>  6 files changed, 31 insertions(+), 59 deletions(-)
> 
> diff --git a/drivers/media/platform/vimc/vimc-capture.c
> b/drivers/media/platform/vimc/vimc-capture.c
> index 1d56b91830ba..49bc8c133980 100644
> --- a/drivers/media/platform/vimc/vimc-capture.c
> +++ b/drivers/media/platform/vimc/vimc-capture.c
> @@ -92,6 +92,7 @@ static int vimc_cap_try_fmt_vid_cap(struct file
> *file, void *priv,
>  {
>      struct v4l2_pix_format *format = &f->fmt.pix;
>      const struct vimc_pix_map *vpix;
> +    const struct v4l2_format_info *vinfo;
> 
>      format->width = clamp_t(u32, format->width, VIMC_FRAME_MIN_WIDTH,
>                  VIMC_FRAME_MAX_WIDTH) & ~1;
> @@ -104,8 +105,9 @@ static int vimc_cap_try_fmt_vid_cap(struct file
> *file, void *priv,
>          format->pixelformat = fmt_default.pixelformat;
>          vpix = vimc_pix_map_by_pixelformat(format->pixelformat);
>      }
> +    vinfo = v4l2_format_info(format->pixelformat);
>      /* TODO: Add support for custom bytesperline values */
> -    format->bytesperline = format->width * vpix->bpp;
> +    format->bytesperline = format->width * vinfo->bpp[0];
>      format->sizeimage = format->bytesperline * format->height;
> 
>      if (format->field == V4L2_FIELD_ANY)
> @@ -397,6 +399,7 @@ static int vimc_cap_comp_bind(struct device *comp,
> struct device *master,
>      struct v4l2_device *v4l2_dev = master_data;
>      struct vimc_platform_data *pdata = comp->platform_data;
>      const struct vimc_pix_map *vpix;
> +    const struct v4l2_format_info *vinfo;
>      struct vimc_cap_device *vcap;
>      struct video_device *vdev;
>      struct vb2_queue *q;
> @@ -452,7 +455,8 @@ static int vimc_cap_comp_bind(struct device *comp,
> struct device *master,
>      /* Set default frame format */
>      vcap->format = fmt_default;
>      vpix = vimc_pix_map_by_pixelformat(vcap->format.pixelformat);
> -    vcap->format.bytesperline = vcap->format.width * vpix->bpp;
> +    vinfo = v4l2_format_info(vpix->pixelformat);
> +    vcap->format.bytesperline = vcap->format.width * vinfo->bpp[0];
>      vcap->format.sizeimage = vcap->format.bytesperline *
>                   vcap->format.height;
> 
> diff --git a/drivers/media/platform/vimc/vimc-common.c
> b/drivers/media/platform/vimc/vimc-common.c
> index 7e1ae0b12f1e..2d1205f0a600 100644
> --- a/drivers/media/platform/vimc/vimc-common.c
> +++ b/drivers/media/platform/vimc/vimc-common.c
> @@ -21,146 +21,100 @@ static const struct vimc_pix_map vimc_pix_map_list[] = {
>      {
>          .code = MEDIA_BUS_FMT_BGR888_1X24,
>          .pixelformat = V4L2_PIX_FMT_BGR24,
> -        .bpp = 3,
> -        .bayer = false,
>      },
>      {
>          .code = MEDIA_BUS_FMT_RGB888_1X24,
>          .pixelformat = V4L2_PIX_FMT_RGB24,
> -        .bpp = 3,
> -        .bayer = false,
>      },
>      {
>          .code = MEDIA_BUS_FMT_ARGB8888_1X32,
>          .pixelformat = V4L2_PIX_FMT_ARGB32,
> -        .bpp = 4,
> -        .bayer = false,
>      },
> 
>      /* Bayer formats */
>      {
>          .code = MEDIA_BUS_FMT_SBGGR8_1X8,
>          .pixelformat = V4L2_PIX_FMT_SBGGR8,
> -        .bpp = 1,
> -        .bayer = true,
>      },
>      {
>          .code = MEDIA_BUS_FMT_SGBRG8_1X8,
>          .pixelformat = V4L2_PIX_FMT_SGBRG8,
> -        .bpp = 1,
> -        .bayer = true,
>      },
>      {
>          .code = MEDIA_BUS_FMT_SGRBG8_1X8,
>          .pixelformat = V4L2_PIX_FMT_SGRBG8,
> -        .bpp = 1,
> -        .bayer = true,
>      },
>      {
>          .code = MEDIA_BUS_FMT_SRGGB8_1X8,
>          .pixelformat = V4L2_PIX_FMT_SRGGB8,
> -        .bpp = 1,
> -        .bayer = true,
>      },
>      {
>          .code = MEDIA_BUS_FMT_SBGGR10_1X10,
>          .pixelformat = V4L2_PIX_FMT_SBGGR10,
> -        .bpp = 2,
> -        .bayer = true,
>      },
>      {
>          .code = MEDIA_BUS_FMT_SGBRG10_1X10,
>          .pixelformat = V4L2_PIX_FMT_SGBRG10,
> -        .bpp = 2,
> -        .bayer = true,
>      },
>      {
>          .code = MEDIA_BUS_FMT_SGRBG10_1X10,
>          .pixelformat = V4L2_PIX_FMT_SGRBG10,
> -        .bpp = 2,
> -        .bayer = true,
>      },
>      {
>          .code = MEDIA_BUS_FMT_SRGGB10_1X10,
>          .pixelformat = V4L2_PIX_FMT_SRGGB10,
> -        .bpp = 2,
> -        .bayer = true,
>      },
> 
>      /* 10bit raw bayer a-law compressed to 8 bits */
>      {
>          .code = MEDIA_BUS_FMT_SBGGR10_ALAW8_1X8,
>          .pixelformat = V4L2_PIX_FMT_SBGGR10ALAW8,
> -        .bpp = 1,
> -        .bayer = true,
>      },
>      {
>          .code = MEDIA_BUS_FMT_SGBRG10_ALAW8_1X8,
>          .pixelformat = V4L2_PIX_FMT_SGBRG10ALAW8,
> -        .bpp = 1,
> -        .bayer = true,
>      },
>      {
>          .code = MEDIA_BUS_FMT_SGRBG10_ALAW8_1X8,
>          .pixelformat = V4L2_PIX_FMT_SGRBG10ALAW8,
> -        .bpp = 1,
> -        .bayer = true,
>      },
>      {
>          .code = MEDIA_BUS_FMT_SRGGB10_ALAW8_1X8,
>          .pixelformat = V4L2_PIX_FMT_SRGGB10ALAW8,
> -        .bpp = 1,
> -        .bayer = true,
>      },
> 
>      /* 10bit raw bayer DPCM compressed to 8 bits */
>      {
>          .code = MEDIA_BUS_FMT_SBGGR10_DPCM8_1X8,
>          .pixelformat = V4L2_PIX_FMT_SBGGR10DPCM8,
> -        .bpp = 1,
> -        .bayer = true,
>      },
>      {
>          .code = MEDIA_BUS_FMT_SGBRG10_DPCM8_1X8,
>          .pixelformat = V4L2_PIX_FMT_SGBRG10DPCM8,
> -        .bpp = 1,
> -        .bayer = true,
>      },
>      {
>          .code = MEDIA_BUS_FMT_SGRBG10_DPCM8_1X8,
>          .pixelformat = V4L2_PIX_FMT_SGRBG10DPCM8,
> -        .bpp = 1,
> -        .bayer = true,
>      },
>      {
>          .code = MEDIA_BUS_FMT_SRGGB10_DPCM8_1X8,
>          .pixelformat = V4L2_PIX_FMT_SRGGB10DPCM8,
> -        .bpp = 1,
> -        .bayer = true,
>      },
>      {
>          .code = MEDIA_BUS_FMT_SBGGR12_1X12,
>          .pixelformat = V4L2_PIX_FMT_SBGGR12,
> -        .bpp = 2,
> -        .bayer = true,
>      },
>      {
>          .code = MEDIA_BUS_FMT_SGBRG12_1X12,
>          .pixelformat = V4L2_PIX_FMT_SGBRG12,
> -        .bpp = 2,
> -        .bayer = true,
>      },
>      {
>          .code = MEDIA_BUS_FMT_SGRBG12_1X12,
>          .pixelformat = V4L2_PIX_FMT_SGRBG12,
> -        .bpp = 2,
> -        .bayer = true,
>      },
>      {
>          .code = MEDIA_BUS_FMT_SRGGB12_1X12,
>          .pixelformat = V4L2_PIX_FMT_SRGGB12,
> -        .bpp = 2,
> -        .bayer = true,
>      },
>  };
> 
> diff --git a/drivers/media/platform/vimc/vimc-common.h
> b/drivers/media/platform/vimc/vimc-common.h
> index 9c2e0e216c6b..0a54dcd37410 100644
> --- a/drivers/media/platform/vimc/vimc-common.h
> +++ b/drivers/media/platform/vimc/vimc-common.h
> @@ -79,9 +79,7 @@ struct vimc_platform_data {
>   */
>  struct vimc_pix_map {
>      unsigned int code;
> -    unsigned int bpp;
>      u32 pixelformat;
> -    bool bayer;
>  };
> 
>  /**
> diff --git a/drivers/media/platform/vimc/vimc-debayer.c
> b/drivers/media/platform/vimc/vimc-debayer.c
> index b72b8385067b..50801f76a448 100644
> --- a/drivers/media/platform/vimc/vimc-debayer.c
> +++ b/drivers/media/platform/vimc/vimc-debayer.c
> @@ -314,6 +314,7 @@ static int vimc_deb_s_stream(struct v4l2_subdev
> *sd, int enable)
> 
>      if (enable) {
>          const struct vimc_pix_map *vpix;
> +        const struct v4l2_format_info *vinfo;
>          unsigned int frame_size;
> 
>          if (vdeb->src_frame)
> @@ -321,12 +322,13 @@ static int vimc_deb_s_stream(struct v4l2_subdev
> *sd, int enable)
> 
>          /* Calculate the frame size of the source pad */
>          vpix = vimc_pix_map_by_code(vdeb->src_code);
> +        vinfo = v4l2_format_info(vpix->pixelformat);
>          frame_size = vdeb->sink_fmt.width * vdeb->sink_fmt.height *
> -                vpix->bpp;
> +                vinfo->bpp[0];
> 
>          /* Save the bytes per pixel of the sink */
>          vpix = vimc_pix_map_by_code(vdeb->sink_fmt.code);
> -        vdeb->sink_bpp = vpix->bpp;
> +        vdeb->sink_bpp = vinfo->bpp[0];
> 
>          /* Get the corresponding pixel map from the table */
>          vdeb->sink_pix_map =
> diff --git a/drivers/media/platform/vimc/vimc-scaler.c
> b/drivers/media/platform/vimc/vimc-scaler.c
> index 49ab8d9dd9c9..599653169b1e 100644
> --- a/drivers/media/platform/vimc/vimc-scaler.c
> +++ b/drivers/media/platform/vimc/vimc-scaler.c
> @@ -66,14 +66,22 @@ static int vimc_sca_init_cfg(struct v4l2_subdev *sd,
>      return 0;
>  }
> 
> +static int vimc_is_bayer(const struct vimc_pix_map *vpix)
> +{
> +    const struct v4l2_format_info *vinfo =
> +                v4l2_format_info(vpix->pixelformat);
> +    const u8 *bpp = vinfo->bpp;
> +
> +    return bpp[0] != 1 || bpp[1] || bpp[2] || bpp[3];
> +}
> +
>  static int vimc_sca_enum_mbus_code(struct v4l2_subdev *sd,
>                     struct v4l2_subdev_pad_config *cfg,
>                     struct v4l2_subdev_mbus_code_enum *code)
>  {
>      const struct vimc_pix_map *vpix = vimc_pix_map_by_index(code->index);
> -
>      /* We don't support bayer format */
> -    if (!vpix || vpix->bayer)
> +    if (!vpix || vimc_is_bayer(vpix))
>          return -EINVAL;
> 
>      code->code = vpix->code;
> @@ -92,7 +100,7 @@ static int vimc_sca_enum_frame_size(struct v4l2_subdev *sd,
> 
>      /* Only accept code in the pix map table in non bayer format */
>      vpix = vimc_pix_map_by_code(fse->code);
> -    if (!vpix || vpix->bayer)
> +    if (!vpix || vimc_is_bayer(vpix))
>          return -EINVAL;
> 
>      fse->min_width = VIMC_FRAME_MIN_WIDTH;
> @@ -135,7 +143,7 @@ static void vimc_sca_adjust_sink_fmt(struct
> v4l2_mbus_framefmt *fmt)
> 
>      /* Only accept code in the pix map table in non bayer format */
>      vpix = vimc_pix_map_by_code(fmt->code);
> -    if (!vpix || vpix->bayer)
> +    if (!vpix || vimc_is_bayer(vpix))
>          fmt->code = sink_fmt_default.code;
> 
>      fmt->width = clamp_t(u32, fmt->width, VIMC_FRAME_MIN_WIDTH,
> @@ -210,6 +218,7 @@ static int vimc_sca_s_stream(struct v4l2_subdev
> *sd, int enable)
> 
>      if (enable) {
>          const struct vimc_pix_map *vpix;
> +        const struct v4l2_format_info *vinfo;
>          unsigned int frame_size;
> 
>          if (vsca->src_frame)
> @@ -217,7 +226,8 @@ static int vimc_sca_s_stream(struct v4l2_subdev
> *sd, int enable)
> 
>          /* Save the bytes per pixel of the sink */
>          vpix = vimc_pix_map_by_code(vsca->sink_fmt.code);
> -        vsca->bpp = vpix->bpp;
> +        vinfo = v4l2_format_info(vpix->pixelformat);
> +        vsca->bpp = vinfo->bpp[0];
> 
>          /* Calculate the width in bytes of the src frame */
>          vsca->src_line_size = vsca->sink_fmt.width *
> diff --git a/drivers/media/platform/vimc/vimc-sensor.c
> b/drivers/media/platform/vimc/vimc-sensor.c
> index 6c53b9fc1617..81acd12b0896 100644
> --- a/drivers/media/platform/vimc/vimc-sensor.c
> +++ b/drivers/media/platform/vimc/vimc-sensor.c
> @@ -109,10 +109,12 @@ static void vimc_sen_tpg_s_format(struct
> vimc_sen_device *vsen)
>  {
>      const struct vimc_pix_map *vpix =
>                  vimc_pix_map_by_code(vsen->mbus_format.code);
> +    const struct v4l2_format_info *vinfo =
> +                v4l2_format_info(vpix->pixelformat);
> 
>      tpg_reset_source(&vsen->tpg, vsen->mbus_format.width,
>               vsen->mbus_format.height, vsen->mbus_format.field);
> -    tpg_s_bytesperline(&vsen->tpg, 0, vsen->mbus_format.width * vpix->bpp);
> +    tpg_s_bytesperline(&vsen->tpg, 0, vsen->mbus_format.width * vinfo->bpp[0]);
>      tpg_s_buf_height(&vsen->tpg, vsen->mbus_format.height);
>      tpg_s_fourcc(&vsen->tpg, vpix->pixelformat);
>      /* TODO: add support for V4L2_FIELD_ALTERNATE */
> @@ -206,6 +208,7 @@ static int vimc_sen_s_stream(struct v4l2_subdev
> *sd, int enable)
> 
>      if (enable) {
>          const struct vimc_pix_map *vpix;
> +        const struct v4l2_format_info *vinfo;
>          unsigned int frame_size;
> 
>          if (vsen->kthread_sen)
> @@ -214,7 +217,8 @@ static int vimc_sen_s_stream(struct v4l2_subdev
> *sd, int enable)
> 
>          /* Calculate the frame size */
>          vpix = vimc_pix_map_by_code(vsen->mbus_format.code);
> -        frame_size = vsen->mbus_format.width * vpix->bpp *
> +        vinfo = v4l2_format_info(vpix->pixelformat);
> +        frame_size = vsen->mbus_format.width * vinfo->bpp[0] *
>                   vsen->mbus_format.height;
> 
>          /*
>