[media] v4l2-ioctl.c: improve cropcap compatibility code

- Add a check for the case that both the cropcap and g_selection ops
  are NULL. This shouldn't happen, but I feel happier if the code
  guards against this.

- If g_selection exists, then ignore ENOTTY and ENOIOCTLCMD error
  codes from cropcap. Just assume square pixelaspect ratio in that
  case. This situation can happen if the bridge driver's cropcap op
  calls the corresponding subdev's op. So the cropcap ioctl is set,
  but it might return ENOIOCTLCMD anyway. In the past this would
  just return an error which is wrong.

- Call cropcap first and let g_selection overwrite the bounds and
  defrect. This safeguards against subdev cropcap implementations
  that set those rectangles as well. What g_selection returns has
  priority over what such cropcap implementations return.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
index 6bf5a3ecd12652540fa90efc0fd1362533ad0ce1..28e5be2c2eef22f75a1a902131ee987bb927ad0d 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -2160,40 +2160,56 @@ static int v4l_cropcap(const struct v4l2_ioctl_ops *ops,
                                struct file *file, void *fh, void *arg)
 {
        struct v4l2_cropcap *p = arg;
+       struct v4l2_selection s = { .type = p->type };
+       int ret = 0;
 
-       if (ops->vidioc_g_selection) {
-               struct v4l2_selection s = { .type = p->type };
-               int ret;
+       /* setting trivial pixelaspect */
+       p->pixelaspect.numerator = 1;
+       p->pixelaspect.denominator = 1;
 
-               /* obtaining bounds */
-               if (V4L2_TYPE_IS_OUTPUT(p->type))
-                       s.target = V4L2_SEL_TGT_COMPOSE_BOUNDS;
-               else
-                       s.target = V4L2_SEL_TGT_CROP_BOUNDS;
+       /*
+        * The determine_valid_ioctls() call already should ensure
+        * that this can never happen, but just in case...
+        */
+       if (WARN_ON(!ops->vidioc_cropcap && !ops->vidioc_cropcap))
+               return -ENOTTY;
 
-               ret = ops->vidioc_g_selection(file, fh, &s);
-               if (ret)
-                       return ret;
-               p->bounds = s.r;
+       if (ops->vidioc_cropcap)
+               ret = ops->vidioc_cropcap(file, fh, p);
 
-               /* obtaining defrect */
-               if (V4L2_TYPE_IS_OUTPUT(p->type))
-                       s.target = V4L2_SEL_TGT_COMPOSE_DEFAULT;
-               else
-                       s.target = V4L2_SEL_TGT_CROP_DEFAULT;
+       if (!ops->vidioc_g_selection)
+               return ret;
 
-               ret = ops->vidioc_g_selection(file, fh, &s);
-               if (ret)
-                       return ret;
-               p->defrect = s.r;
-       }
+       /*
+        * Ignore ENOTTY or ENOIOCTLCMD error returns, just use the
+        * square pixel aspect ratio in that case.
+        */
+       if (ret && ret != -ENOTTY && ret != -ENOIOCTLCMD)
+               return ret;
 
-       /* setting trivial pixelaspect */
-       p->pixelaspect.numerator = 1;
-       p->pixelaspect.denominator = 1;
+       /* Use g_selection() to fill in the bounds and defrect rectangles */
 
-       if (ops->vidioc_cropcap)
-               return ops->vidioc_cropcap(file, fh, p);
+       /* obtaining bounds */
+       if (V4L2_TYPE_IS_OUTPUT(p->type))
+               s.target = V4L2_SEL_TGT_COMPOSE_BOUNDS;
+       else
+               s.target = V4L2_SEL_TGT_CROP_BOUNDS;
+
+       ret = ops->vidioc_g_selection(file, fh, &s);
+       if (ret)
+               return ret;
+       p->bounds = s.r;
+
+       /* obtaining defrect */
+       if (V4L2_TYPE_IS_OUTPUT(p->type))
+               s.target = V4L2_SEL_TGT_COMPOSE_DEFAULT;
+       else
+               s.target = V4L2_SEL_TGT_CROP_DEFAULT;
+
+       ret = ops->vidioc_g_selection(file, fh, &s);
+       if (ret)
+               return ret;
+       p->defrect = s.r;
 
        return 0;
 }