LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>
To: Philipp Zabel <p.zabel@pengutronix.de>
Cc: Steve Longerbeam <slongerbeam@gmail.com>,
	Mauro Carvalho Chehab <mchehab@kernel.org>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Shawn Guo <shawnguo@kernel.org>,
	Sascha Hauer <s.hauer@pengutronix.de>,
	Pengutronix Kernel Team <kernel@pengutronix.de>,
	Fabio Estevam <festevam@gmail.com>,
	NXP Linux Team <linux-imx@nxp.com>,
	linux-media@vger.kernel.org, linux-staging@lists.linux.dev,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, kernel@puri.sm,
	phone-devel@vger.kernel.org
Subject: Re: [PATCH] media: imx: Round line size to 4 bytes
Date: Sun, 17 Oct 2021 13:07:13 +0200	[thread overview]
Message-ID: <20211017130713.4668c616.dorota.czaplejewicz@puri.sm> (raw)
In-Reply-To: <1d8878e86b862ae8d551b6796e86c4fb1eb5d671.camel@pengutronix.de>

[-- Attachment #1: Type: text/plain, Size: 4673 bytes --]

Hello,

On Thu, 14 Oct 2021 13:26:26 +0200
Philipp Zabel <p.zabel@pengutronix.de> wrote:

> Hi Dorota,
> 
> On Wed, 2021-10-13 at 11:26 +0200, Dorota Czaplejewicz wrote:
> > On Fri, 08 Oct 2021 14:19:41 +0200 Philipp Zabel <p.zabel@pengutronix.de> wrote:  
> [...]
> > > I wonder: if you use 4-byte aligned width and odd height, does the CSI
> > > write over the end of the buffer?  
> > 
> > I tested this case, and found a glitch which suggests the last 4 bytes are ignored:
> > 
> > https://source.puri.sm/Librem5/linux-next/uploads/cfb59e3832431aaa3a69549455502568/image.png  
> 
> Thank you for testing, so it appears that at least without FBUF_STRIDE
> the only requirement is that the whole image size must be a multiple of
> 8 bytes.
> 
> > That would be taken care of rounding up towards a number decided at runtime, like:
> > 
> > divisor = 8 >> (mbus->height % 2);  
> 
> Which would then cause the CSI to write past the end of the buffer?
> 
I'm not sure if you point out the mistake here (should be "4 <<"), or the fact that rounding is happening. If it's the latter, then it's of no concern: the values derived here are used to calculate buffer size.

I'm submitting a new series where this is fixed.

> I'd rather make sure that either the number of lines is even or the
> width is a multiple of 8 bytes.
> 
> > > > Signed-off-by: Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>
> > > > ---
> > > > 
> > > > Hello,
> > > > 
> > > > my previous patch identified something that was not a problem,
> > > > so I'm sending a different one.
> > > > 
> > > > This has been tested on the Librem 5.
> > > > 
> > > > Cheers,
> > > > Dorota
> > > > 
> > > >  drivers/staging/media/imx/imx-media-utils.c | 4 ++--
> > > >  1 file changed, 2 insertions(+), 2 deletions(-)
> > > > 
> > > > diff --git a/drivers/staging/media/imx/imx-media-utils.c b/drivers/staging/media/imx/imx-media-utils.c
> > > > index 5128915a5d6f..a303003929e3 100644
> > > > --- a/drivers/staging/media/imx/imx-media-utils.c
> > > > +++ b/drivers/staging/media/imx/imx-media-utils.c
> > > > @@ -545,13 +545,13 @@ int imx_media_mbus_fmt_to_pix_fmt(struct v4l2_pix_format *pix,
> > > >  	}
> > > >  
> > > >  	/* Round up width for minimum burst size */
> > > > -	width = round_up(mbus->width, 8);
> > > > +	width = round_up(mbus->width, 4);
> > > >  
> > > >  	/* Round up stride for IDMAC line start address alignment */
> > > >  	if (cc->planar)
> > > >  		stride = round_up(width, 16);
> > > >  	else
> > > > -		stride = round_up((width * cc->bpp) >> 3, 8);
> > > > +		stride = round_up((width * cc->bpp) >> 3, 4);    
> > > 
> > > Second, even if this works fine on the i.MX7/8M CSI, the alignment is
> > > still required for the i.MX5/6 IPU, for which this code and the comments
> > > were written. So we need a way to differentiate the two cases here.
> > > 
> > > regards
> > > Philipp  
> > 
> > How best to go about this? I can see in the file imx-media-capture.c
> > that there the video device lives in struct capture_priv.vdev.vfd.
> > Would that be the right place to query about the underlying hardware?
> > 
> > Then the following functions would gain a new "small_divisor" parameter:
> > - imx_media_mbus_fmt_to_pix_fmt (a GPL symbol)
> > - imx_media_mbus_fmt_to_ipu_image (a GPL symbol)
> > - __capture_try_fmt  
> 
> That sounds like it would work around the current code when it (at least
> part of imx_media_mbus_fmt_to_pix_fmt()) should be split between i.MX5/6
> and i.MX7/8 implementations. For example rounding up the stride is not
> useful on i.MX7/8, it just doesn't currently hurt because imx7-media-csi 
> is not using bytesperline to set up FBUF_STRIDE. And certainly the
> comments don't apply.
> 
> imx_media_mbus_fmt_to_ipu_image() is unused and should probably be
> dropped, same as imx_media_ipu_image_to_mbus_fmt().

Done in next series.
> 
> > Those would have to extract the device type from struct capture_priv:
> > - __capture_legacy_try_fmt
> > - capture_try_fmt_vid_cap
> > - capture_s_fmt_vid_cap
> > - capture_init_format  
> 
> Maybe imx_media_mbus_fmt_to_pix_fmt should be moved into imx-media-
> capture.c be passed struct capture_priv to avoid duplicating the device
> type check?
> 
I opted not to, in favor of passing the actual device type. It comes out to the same thing, except a simple value is passed around instead of a device.

> imx_media_capture_device_init() could gain a new parameter (or maybe
> replace legacy_api) to set the device type.

Thanks, this is what I was missing.

Regards,
Dorota
> 
> regards
> Philipp


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

  reply	other threads:[~2021-10-17 11:07 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-06 11:05 Dorota Czaplejewicz
2021-10-08 12:19 ` Philipp Zabel
2021-10-13  9:26   ` Dorota Czaplejewicz
2021-10-14 11:26     ` Philipp Zabel
2021-10-17 11:07       ` Dorota Czaplejewicz [this message]
2021-10-18 10:21         ` Philipp Zabel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211017130713.4668c616.dorota.czaplejewicz@puri.sm \
    --to=dorota.czaplejewicz@puri.sm \
    --cc=festevam@gmail.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=kernel@pengutronix.de \
    --cc=kernel@puri.sm \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-imx@nxp.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=linux-staging@lists.linux.dev \
    --cc=mchehab@kernel.org \
    --cc=p.zabel@pengutronix.de \
    --cc=phone-devel@vger.kernel.org \
    --cc=s.hauer@pengutronix.de \
    --cc=shawnguo@kernel.org \
    --cc=slongerbeam@gmail.com \
    --subject='Re: [PATCH] media: imx: Round line size to 4 bytes' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).