V4L/DVB (11024): soc-camera: separate S_FMT and S_CROP operations

As host and camera drivers become more complex, differences between S_FMT and
S_CROP functionality grow, this patch separates them.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 49 insertions, 18 deletions

diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c
index 2cc203cfbe6c..c522616ef38f 100644
--- a/drivers/media/video/pxa_camera.c
+++ b/drivers/media/video/pxa_camera.c
@@ -1150,8 +1150,43 @@ static int pxa_camera_get_formats(struct soc_camera_device *icd, int idx,
         return formats;
 }
 
+static int pxa_camera_set_crop(struct soc_camera_device *icd,
+                               struct v4l2_rect *rect)
+{
+        struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
+        struct pxa_camera_dev *pcdev = ici->priv;
+        struct soc_camera_sense sense = {
+                .master_clock = pcdev->mclk,
+                .pixel_clock_max = pcdev->ciclk / 4,
+        };
+        int ret;
+
+        /* If PCLK is used to latch data from the sensor, check sense */
+        if (pcdev->platform_flags & PXA_CAMERA_PCLK_EN)
+                icd->sense = &sense;
+
+        ret = icd->ops->set_crop(icd, rect);
+
+        icd->sense = NULL;
+
+        if (ret < 0) {
+                dev_warn(&ici->dev, "Failed to crop to %ux%u@%u:%u\n",
+                         rect->width, rect->height, rect->left, rect->top);
+        } else if (sense.flags & SOCAM_SENSE_PCLK_CHANGED) {
+                if (sense.pixel_clock > sense.pixel_clock_max) {
+                        dev_err(&ici->dev,
+                                "pixel clock %lu set by the camera too high!",
+                                sense.pixel_clock);
+                        return -EIO;
+                }
+                recalculate_fifo_timeout(pcdev, sense.pixel_clock);
+        }
+
+        return ret;
+}
+
 static int pxa_camera_set_fmt(struct soc_camera_device *icd,
-                              __u32 pixfmt, struct v4l2_rect *rect)
+                              struct v4l2_format *f)
 {
         struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
         struct pxa_camera_dev *pcdev = ici->priv;
@@ -1161,35 +1196,30 @@ static int pxa_camera_set_fmt(struct soc_camera_device *icd,
                 .master_clock = pcdev->mclk,
                 .pixel_clock_max = pcdev->ciclk / 4,
         };
+        struct v4l2_pix_format *pix = &f->fmt.pix;
+        struct v4l2_format cam_f = *f;
         int ret;
 
-        if (pixfmt) {
-                xlate = soc_camera_xlate_by_fourcc(icd, pixfmt);
-                if (!xlate) {
-                        dev_warn(&ici->dev, "Format %x not found\n", pixfmt);
-                        return -EINVAL;
-                }
-
-                cam_fmt = xlate->cam_fmt;
+        xlate = soc_camera_xlate_by_fourcc(icd, pix->pixelformat);
+        if (!xlate) {
+                dev_warn(&ici->dev, "Format %x not found\n", pix->pixelformat);
+                return -EINVAL;
         }
 
+        cam_fmt = xlate->cam_fmt;
+
         /* If PCLK is used to latch data from the sensor, check sense */
         if (pcdev->platform_flags & PXA_CAMERA_PCLK_EN)
                 icd->sense = &sense;
 
-        switch (pixfmt) {
-        case 0:                         /* Only geometry change */
-                ret = icd->ops->set_fmt(icd, pixfmt, rect);
-                break;
-        default:
-                ret = icd->ops->set_fmt(icd, cam_fmt->fourcc, rect);
-        }
+        cam_f.fmt.pix.pixelformat = cam_fmt->fourcc;
+        ret = icd->ops->set_fmt(icd, &cam_f);
 
         icd->sense = NULL;
 
         if (ret < 0) {
                 dev_warn(&ici->dev, "Failed to configure for format %x\n",
-                         pixfmt);
+                         pix->pixelformat);
         } else if (sense.flags & SOCAM_SENSE_PCLK_CHANGED) {
                 if (sense.pixel_clock > sense.pixel_clock_max) {
                         dev_err(&ici->dev,
@@ -1200,7 +1230,7 @@ static int pxa_camera_set_fmt(struct soc_camera_device *icd,
                 recalculate_fifo_timeout(pcdev, sense.pixel_clock);
         }
 
-        if (pixfmt && !ret) {
+        if (!ret) {
                 icd->buswidth = xlate->buswidth;
                 icd->current_fmt = xlate->host_fmt;
         }
@@ -1364,6 +1394,7 @@ static struct soc_camera_host_ops pxa_soc_camera_host_ops = {
         .remove         = pxa_camera_remove_device,
         .suspend        = pxa_camera_suspend,
         .resume         = pxa_camera_resume,
+        .set_crop       = pxa_camera_set_crop,
         .get_formats    = pxa_camera_get_formats,
         .set_fmt        = pxa_camera_set_fmt,
         .try_fmt        = pxa_camera_try_fmt,