Hi Jacopo,
Am Montag, 14. Februar 2022, 19:51:15 CET schrieb Jacopo Mondi:
> Hello
>
> On Fri, Feb 11, 2022 at 03:27:46PM +0100, Alexander Stein wrote:
> > From: Dorota Czaplejewicz <dorota.czaplejewicz@xxxxxxx>
> >
> > This splits out a format handler which takes into account
> > the capabilities of the i.MX7/8 video device,
> > as opposed to the default handler compatible with both i.MX5/6 and
> > i.MX7/8.
> >
> > Signed-off-by: Dorota Czaplejewicz <dorota.czaplejewicz@xxxxxxx>
> > Signed-off-by: Alexander Stein <alexander.stein@xxxxxxxxxxxxxxx>
> > ---
> > Changes in v2:
> > * Switch back to using enum
> > * Get rid of an additional call to v4l2_fill_pixfmt()
> >
> > drivers/staging/media/imx/imx-media-utils.c | 60 +++++++++++++++++++--
> > 1 file changed, 56 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/staging/media/imx/imx-media-utils.c
> > b/drivers/staging/media/imx/imx-media-utils.c index
> > c42f3da8e3a8..02a4cb124d37 100644
> > --- a/drivers/staging/media/imx/imx-media-utils.c
> > +++ b/drivers/staging/media/imx/imx-media-utils.c
> > @@ -516,10 +516,9 @@ void imx_media_try_colorimetry(struct
> > v4l2_mbus_framefmt *tryfmt,>
> > }
> > EXPORT_SYMBOL_GPL(imx_media_try_colorimetry);
> >
> > -int imx_media_mbus_fmt_to_pix_fmt(struct v4l2_pix_format *pix,
> > - const struct v4l2_mbus_framefmt
*mbus,
> > - const struct imx_media_pixfmt
*cc,
> > - enum imx_media_device_type type)
> > +static int imx56_media_mbus_fmt_to_pix_fmt(struct v4l2_pix_format *pix,
> > + const struct
v4l2_mbus_framefmt *mbus,
> > + const struct
imx_media_pixfmt *cc)
> >
> > {
> >
> > u32 width;
> > u32 stride;
> >
> > @@ -568,6 +567,59 @@ int imx_media_mbus_fmt_to_pix_fmt(struct
> > v4l2_pix_format *pix,>
> > return 0;
> >
> > }
> >
> > +
> > +static int imx78_media_mbus_fmt_to_pix_fmt(struct v4l2_pix_format *pix,
> > + const struct
v4l2_mbus_framefmt *mbus,
> > + const struct
imx_media_pixfmt *cc)
> > +{
> > + u32 aligned_width;
> > + int ret;
> > +
> > + if (!cc)
> > + cc = imx_media_find_mbus_format(mbus->code,
PIXFMT_SEL_ANY);
> > +
> > + if (!cc)
> > + return -EINVAL;
> > + /*
> > + * The hardware can handle line lengths divisible by 4 pixels
> > + * as long as the whole buffer size ends up divisible by 8 bytes.
> > + * If not, use the value of 8 pixels recommended in the datasheet.
> > + * Only 8bits-per-pixel formats may need to get aligned to 8
pixels,
> > + * because both 10-bit and 16-bit pixels occupy 2 bytes.
> > + * In those, 4-pixel aligmnent is equal to 8-byte alignment.
> > + */
> > + if (cc->bpp == 1)
>
> Am I mistaken or in the format enumeration bpp is expressed in bits
> and not bytes ?
No, you are completely right. Thanks for find noticing that.
Regards,
Alexander
> > + aligned_width = round_up(mbus->width, 8);
> > + else
> > + aligned_width = round_up(mbus->width, 4);
> > +
> > + ret = v4l2_fill_pixfmt(pix, cc->fourcc,
> > + aligned_width, mbus->height);
> > + if (ret)
> > + return ret;
> > +
> > + pix->colorspace = mbus->colorspace;
> > + pix->xfer_func = mbus->xfer_func;
> > + pix->ycbcr_enc = mbus->ycbcr_enc;
> > + pix->quantization = mbus->quantization;
> > + pix->field = mbus->field;
> > +
> > + return ret;
> > +}
> > +
> > +int imx_media_mbus_fmt_to_pix_fmt(struct v4l2_pix_format *pix,
> > + const struct v4l2_mbus_framefmt
*mbus,
> > + const struct imx_media_pixfmt
*cc,
> > + enum imx_media_device_type type)
> > +{
> > + switch (type) {
> > + case DEVICE_TYPE_IMX56:
> > + return imx56_media_mbus_fmt_to_pix_fmt(pix, mbus, cc);
> > + case DEVICE_TYPE_IMX78:
> > + return imx78_media_mbus_fmt_to_pix_fmt(pix, mbus, cc);
> > + }
> > + return -EINVAL;
> > +}
> >
> > EXPORT_SYMBOL_GPL(imx_media_mbus_fmt_to_pix_fmt);
> >
> > void imx_media_free_dma_buf(struct device *dev,
> >
> > --
> > 2.25.1
