Hi Hans, On Friday 01 Jul 2016 12:52:31 Hans Verkuil wrote: > On 06/28/2016 03:20 PM, Laurent Pinchart wrote: > > The S_FMT and TRY_FMT handlers in multiplane mode attempt at clearing > > the reserved fields of the v4l2_format structure after the pix_mp > > member. However, the reserved fields are inside pix_mp, not after it. > > > > Signed-off-by: Laurent Pinchart > > <[email protected]> > > --- > > > > drivers/media/v4l2-core/v4l2-ioctl.c | 8 ++++---- > > 1 file changed, 4 insertions(+), 4 deletions(-) > > > > Kieran, this should fix the v4l2-compliance failures you saw when not > > clearing pix_mp.reserved manually in the FDP1 driver. Could you please > > test it ? > > > > diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c > > b/drivers/media/v4l2-core/v4l2-ioctl.c index 19d3aee3b374..86332072a575 > > 100644 > > --- a/drivers/media/v4l2-core/v4l2-ioctl.c > > +++ b/drivers/media/v4l2-core/v4l2-ioctl.c > > @@ -1508,7 +1508,7 @@ static int v4l_s_fmt(const struct v4l2_ioctl_ops > > *ops,> > > case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE: > > if (unlikely(!is_rx || !is_vid || !ops- >vidioc_s_fmt_vid_cap_mplane)) > > > > break; > > > > - CLEAR_AFTER_FIELD(p, fmt.pix_mp); > > + CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func); > > The same is needed in v4l_try_fmt.
Yes it is. [snip] Oh, surprise, it's here already :-) > > @@ -1598,7 +1598,7 @@ static int v4l_try_fmt(const struct v4l2_ioctl_ops > > case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE: > > if (unlikely(!is_rx || !is_vid || !ops-> > > vidioc_try_fmt_vid_cap_mplane)) > > break; > > - CLEAR_AFTER_FIELD(p, fmt.pix_mp); > > + CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func); > > return ops->vidioc_try_fmt_vid_cap_mplane(file, fh, arg); > > case V4L2_BUF_TYPE_VIDEO_OVERLAY: > > if (unlikely(!is_rx || !is_vid || !ops-> > > vidioc_try_fmt_vid_overlay)) > > @@ -1626,7 +1626,7 @@ static int v4l_try_fmt(const struct v4l2_ioctl_ops > > case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE: > > if (unlikely(!is_tx || !is_vid || !ops-> > > vidioc_try_fmt_vid_out_mplane)) > > break; > > - CLEAR_AFTER_FIELD(p, fmt.pix_mp); > > + CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func); > > return ops->vidioc_try_fmt_vid_out_mplane(file, fh, arg); > > case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY: > > if (unlikely(!is_tx || !is_vid || > > !ops->vidioc_try_fmt_vid_out_overlay)) -- Regards, Laurent Pinchart -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
