2021-01-11 13:10:24

by Ricardo Ribalda

[permalink] [raw]
Subject: [PATCH] hantro: Format IOCTLs compliance fixes

Clear the reserved fields.

Fixes:
fail: v4l2-test-formats.cpp(482): pix_mp.plane_fmt[0].reserved not zeroed
test VIDIOC_TRY_FMT: FAIL
fail: v4l2-test-formats.cpp(482): pix_mp.plane_fmt[0].reserved not zeroed
test VIDIOC_S_FMT: FAIL

Signed-off-by: Ricardo Ribalda <[email protected]>
---
drivers/staging/media/hantro/hantro_v4l2.c | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/drivers/staging/media/hantro/hantro_v4l2.c b/drivers/staging/media/hantro/hantro_v4l2.c
index b668a82d40ad..9b384fbffc93 100644
--- a/drivers/staging/media/hantro/hantro_v4l2.c
+++ b/drivers/staging/media/hantro/hantro_v4l2.c
@@ -239,6 +239,7 @@ static int hantro_try_fmt(const struct hantro_ctx *ctx,
const struct hantro_fmt *fmt, *vpu_fmt;
bool capture = V4L2_TYPE_IS_CAPTURE(type);
bool coded;
+ int i;

coded = capture == ctx->is_encoder;

@@ -293,6 +294,10 @@ static int hantro_try_fmt(const struct hantro_ctx *ctx,
pix_mp->width * pix_mp->height * fmt->max_depth;
}

+ for (i = 0; i < pix_mp->num_planes; i++)
+ memset(pix_mp->plane_fmt[i].reserved, 0,
+ sizeof(pix_mp->plane_fmt[i].reserved));
+
return 0;
}

--
2.30.0.284.gd98b1dd5eaa7-goog