2021-10-01 09:36:47

by Ricardo Ribalda

Subject: [PATCH v2 2/7] media: ipu3-cio2: Set valid initial format

The initial format did not have a valid size.

Fixes v4l2-compliance:

fail: v4l2-test-formats.cpp(723): Video Output Multiplanar:
TRY_FMT(G_FMT) != G_FMT
test VIDIOC_TRY_FMT: FAIL

Signed-off-by: Ricardo Ribalda <[email protected]>
---
v2: Suggested by Sakari Ailus <[email protected]>

Replace number with calculation based on width.

drivers/staging/media/ipu3/ipu3-v4l2.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/media/ipu3/ipu3-v4l2.c b/drivers/staging/media/ipu3/ipu3-v4l2.c
index 38a2407645096..19c4fcabce0db 100644
--- a/drivers/staging/media/ipu3/ipu3-v4l2.c
+++ b/drivers/staging/media/ipu3/ipu3-v4l2.c
@@ -1136,7 +1136,8 @@ static int imgu_v4l2_node_setup(struct imgu_device *imgu, unsigned int pipe,
def_pix_fmt.height = def_bus_fmt.height;
def_pix_fmt.field = def_bus_fmt.field;
def_pix_fmt.num_planes = 1;
- def_pix_fmt.plane_fmt[0].bytesperline = def_pix_fmt.width * 2;
+ def_pix_fmt.plane_fmt[0].bytesperline =
+ DIV_ROUND_UP(def_bus_fmt.width, 50) * 64;
def_pix_fmt.plane_fmt[0].sizeimage =
def_pix_fmt.height * def_pix_fmt.plane_fmt[0].bytesperline;
def_pix_fmt.flags = 0;
--
2.33.0.800.g4c38ced690-goog

2021-10-01 09:47:49

by Sakari Ailus

Subject: Re: [PATCH v2 2/7] media: ipu3-cio2: Set valid initial format

On Fri, Oct 01, 2021 at 09:33:43AM +0000, Ricardo Ribalda wrote:
> The initial format did not have a valid size.
>
> Fixes v4l2-compliance:
>
> fail: v4l2-test-formats.cpp(723): Video Output Multiplanar:
> TRY_FMT(G_FMT) != G_FMT
> test VIDIOC_TRY_FMT: FAIL
>
> Signed-off-by: Ricardo Ribalda <[email protected]>
> ---
> v2: Suggested by Sakari Ailus <[email protected]>
>
> Replace number with calculation based on width.
>
> drivers/staging/media/ipu3/ipu3-v4l2.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/staging/media/ipu3/ipu3-v4l2.c b/drivers/staging/media/ipu3/ipu3-v4l2.c
> index 38a2407645096..19c4fcabce0db 100644
> --- a/drivers/staging/media/ipu3/ipu3-v4l2.c
> +++ b/drivers/staging/media/ipu3/ipu3-v4l2.c
> @@ -1136,7 +1136,8 @@ static int imgu_v4l2_node_setup(struct imgu_device *imgu, unsigned int pipe,
> def_pix_fmt.height = def_bus_fmt.height;
> def_pix_fmt.field = def_bus_fmt.field;
> def_pix_fmt.num_planes = 1;
> - def_pix_fmt.plane_fmt[0].bytesperline = def_pix_fmt.width * 2;
> + def_pix_fmt.plane_fmt[0].bytesperline =
> + DIV_ROUND_UP(def_bus_fmt.width, 50) * 64;

cio2_bytesperline()? :-)

--
Sakari Ailus