|
@@ -228,6 +228,8 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)
|
|
|
|
|
|
case VIDIOC_SUBDEV_G_CROP: {
|
|
|
struct v4l2_subdev_crop *crop = arg;
|
|
|
+ struct v4l2_subdev_selection sel;
|
|
|
+ int rval;
|
|
|
|
|
|
if (crop->which != V4L2_SUBDEV_FORMAT_TRY &&
|
|
|
crop->which != V4L2_SUBDEV_FORMAT_ACTIVE)
|
|
@@ -236,11 +238,27 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)
|
|
|
if (crop->pad >= sd->entity.num_pads)
|
|
|
return -EINVAL;
|
|
|
|
|
|
- return v4l2_subdev_call(sd, pad, get_crop, subdev_fh, crop);
|
|
|
+ rval = v4l2_subdev_call(sd, pad, get_crop, subdev_fh, crop);
|
|
|
+ if (rval != -ENOIOCTLCMD)
|
|
|
+ return rval;
|
|
|
+
|
|
|
+ memset(&sel, 0, sizeof(sel));
|
|
|
+ sel.which = crop->which;
|
|
|
+ sel.pad = crop->pad;
|
|
|
+ sel.target = V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL;
|
|
|
+
|
|
|
+ rval = v4l2_subdev_call(
|
|
|
+ sd, pad, get_selection, subdev_fh, &sel);
|
|
|
+
|
|
|
+ crop->rect = sel.r;
|
|
|
+
|
|
|
+ return rval;
|
|
|
}
|
|
|
|
|
|
case VIDIOC_SUBDEV_S_CROP: {
|
|
|
struct v4l2_subdev_crop *crop = arg;
|
|
|
+ struct v4l2_subdev_selection sel;
|
|
|
+ int rval;
|
|
|
|
|
|
if (crop->which != V4L2_SUBDEV_FORMAT_TRY &&
|
|
|
crop->which != V4L2_SUBDEV_FORMAT_ACTIVE)
|
|
@@ -249,7 +267,22 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)
|
|
|
if (crop->pad >= sd->entity.num_pads)
|
|
|
return -EINVAL;
|
|
|
|
|
|
- return v4l2_subdev_call(sd, pad, set_crop, subdev_fh, crop);
|
|
|
+ rval = v4l2_subdev_call(sd, pad, set_crop, subdev_fh, crop);
|
|
|
+ if (rval != -ENOIOCTLCMD)
|
|
|
+ return rval;
|
|
|
+
|
|
|
+ memset(&sel, 0, sizeof(sel));
|
|
|
+ sel.which = crop->which;
|
|
|
+ sel.pad = crop->pad;
|
|
|
+ sel.target = V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL;
|
|
|
+ sel.r = crop->rect;
|
|
|
+
|
|
|
+ rval = v4l2_subdev_call(
|
|
|
+ sd, pad, set_selection, subdev_fh, &sel);
|
|
|
+
|
|
|
+ crop->rect = sel.r;
|
|
|
+
|
|
|
+ return rval;
|
|
|
}
|
|
|
|
|
|
case VIDIOC_SUBDEV_ENUM_MBUS_CODE: {
|