| Message ID | 20230725200249.15447-3-laurent.pinchart@ideasonboard.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: imx: imx7-media-csi: Fix width alignment | expand |
Hi Laurent, thanks for picking up my suggestion. Am Dienstag, 25. Juli 2023, 22:02:48 CEST schrieb Laurent Pinchart: > Enumeration of the minimum, maximum and step values for the image width > does not take hardware constraints into account. Fix it. > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > drivers/media/platform/nxp/imx7-media-csi.c | 14 ++++++++------ > 1 file changed, 8 insertions(+), 6 deletions(-) > > diff --git a/drivers/media/platform/nxp/imx7-media-csi.c > b/drivers/media/platform/nxp/imx7-media-csi.c index > 5684ecd2e3fe..3aa7978d3f8a 100644 > --- a/drivers/media/platform/nxp/imx7-media-csi.c > +++ b/drivers/media/platform/nxp/imx7-media-csi.c > @@ -1076,6 +1076,7 @@ static int imx7_csi_video_enum_framesizes(struct file > *file, void *fh, struct v4l2_frmsizeenum *fsize) > { > const struct imx7_csi_pixfmt *cc; > + u32 walign; > > if (fsize->index > 0) > return -EINVAL; > @@ -1085,16 +1086,17 @@ static int imx7_csi_video_enum_framesizes(struct > file *file, void *fh, return -EINVAL; > > /* > - * TODO: The constraints are hardware-specific and may depend on the > - * pixel format. This should come from the driver using > - * imx_media_capture. > + * The width alignment is 8 bytes as indicated by the > + * CSI_IMAG_PARA.IMAGE_WIDTH documentation. Convert it to pixels. > */ > + walign = 8 * 8 / cc->bpp; > + > fsize->type = V4L2_FRMSIZE_TYPE_CONTINUOUS; > - fsize->stepwise.min_width = 1; > - fsize->stepwise.max_width = 65535; > + fsize->stepwise.min_width = walign; > + fsize->stepwise.max_width = round_down(65535U, walign); > fsize->stepwise.min_height = 1; > fsize->stepwise.max_height = 65535; > - fsize->stepwise.step_width = 1; > + fsize->stepwise.step_width = walign; > fsize->stepwise.step_height = 1; > > return 0; Looks good to me. Reviewed-by: Alexander Stein <alexander.stein@ew.tq-group.com>
diff --git a/drivers/media/platform/nxp/imx7-media-csi.c b/drivers/media/platform/nxp/imx7-media-csi.c index 5684ecd2e3fe..3aa7978d3f8a 100644 --- a/drivers/media/platform/nxp/imx7-media-csi.c +++ b/drivers/media/platform/nxp/imx7-media-csi.c @@ -1076,6 +1076,7 @@ static int imx7_csi_video_enum_framesizes(struct file *file, void *fh, struct v4l2_frmsizeenum *fsize) { const struct imx7_csi_pixfmt *cc; + u32 walign; if (fsize->index > 0) return -EINVAL; @@ -1085,16 +1086,17 @@ static int imx7_csi_video_enum_framesizes(struct file *file, void *fh, return -EINVAL; /* - * TODO: The constraints are hardware-specific and may depend on the - * pixel format. This should come from the driver using - * imx_media_capture. + * The width alignment is 8 bytes as indicated by the + * CSI_IMAG_PARA.IMAGE_WIDTH documentation. Convert it to pixels. */ + walign = 8 * 8 / cc->bpp; + fsize->type = V4L2_FRMSIZE_TYPE_CONTINUOUS; - fsize->stepwise.min_width = 1; - fsize->stepwise.max_width = 65535; + fsize->stepwise.min_width = walign; + fsize->stepwise.max_width = round_down(65535U, walign); fsize->stepwise.min_height = 1; fsize->stepwise.max_height = 65535; - fsize->stepwise.step_width = 1; + fsize->stepwise.step_width = walign; fsize->stepwise.step_height = 1; return 0;
Enumeration of the minimum, maximum and step values for the image width does not take hardware constraints into account. Fix it. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- drivers/media/platform/nxp/imx7-media-csi.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)