drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c | 3 +++ 1 file changed, 3 insertions(+)
Reject unsupported pixel formats in rkisp1_enum_framesizes() to
fix v4l2-compliance failure.
v4l2-compliance test failure:
fail: ../utils/v4l2-compliance/v4l2-test-formats.cpp(403): Accepted framesize for invalid format
test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: FAIL
Tested on: Debix i.MX8MP Model A
Kernel version: v6.17-rc3
v4l2-compliance: 1.31.0-5387
Signed-off-by: Tarang Raval <tarang.raval@siliconsignals.io>
---
drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c
index 6dcefd144d5a..107937b77153 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c
@@ -1383,6 +1383,9 @@ static int rkisp1_enum_framesizes(struct file *file, void *fh,
};
struct rkisp1_capture *cap = video_drvdata(file);
+ if (!rkisp1_find_fmt_cfg(cap, fsize->pixel_format))
+ return -EINVAL;
+
if (fsize->index != 0)
return -EINVAL;
--
2.34.1
Quoting Tarang Raval (2025-08-29 11:14:24) > Reject unsupported pixel formats in rkisp1_enum_framesizes() to > fix v4l2-compliance failure. > > v4l2-compliance test failure: > > fail: ../utils/v4l2-compliance/v4l2-test-formats.cpp(403): Accepted framesize for invalid format > test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: FAIL > > Tested on: Debix i.MX8MP Model A Tested here also on a debix board running v4l2-compliance before and after. Tested-by: Kieran Bingham <kieran.bingham@ideasonboard.com> > Kernel version: v6.17-rc3 > v4l2-compliance: 1.31.0-5387 > > Signed-off-by: Tarang Raval <tarang.raval@siliconsignals.io> > --- > drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c > index 6dcefd144d5a..107937b77153 100644 > --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c > +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c > @@ -1383,6 +1383,9 @@ static int rkisp1_enum_framesizes(struct file *file, void *fh, > }; > struct rkisp1_capture *cap = video_drvdata(file); > > + if (!rkisp1_find_fmt_cfg(cap, fsize->pixel_format)) > + return -EINVAL; > + > if (fsize->index != 0) > return -EINVAL; > > -- > 2.34.1 >
© 2016 - 2025 Red Hat, Inc.