From: Robert Jarzmik <robert.jarzmik@free.fr>
To: Mauro Carvalho Chehab <mchehab@kernel.org>,
Guennadi Liakhovetski <g.liakhovetski@gmx.de>,
Jiri Kosina <trivial@kernel.org>,
Hans Verkuil <hverkuil@xs4all.nl>
Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org,
Robert Jarzmik <robert.jarzmik@free.fr>
Subject: [PATCH v5 09/13] media: platform: pxa_camera: remove set_crop
Date: Mon, 29 Aug 2016 19:55:54 +0200 [thread overview]
Message-ID: <1472493358-24618-10-git-send-email-robert.jarzmik@free.fr> (raw)
In-Reply-To: <1472493358-24618-1-git-send-email-robert.jarzmik@free.fr>
This is to be seen as a regression as the set_crop function is
removed. This is a temporary situation in the v4l2 porting, and will
have to be added later.
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
---
drivers/media/platform/soc_camera/pxa_camera.c | 76 --------------------------
1 file changed, 76 deletions(-)
diff --git a/drivers/media/platform/soc_camera/pxa_camera.c b/drivers/media/platform/soc_camera/pxa_camera.c
index 9b294a14fa2e..8f329d0b2cda 100644
--- a/drivers/media/platform/soc_camera/pxa_camera.c
+++ b/drivers/media/platform/soc_camera/pxa_camera.c
@@ -1294,81 +1294,6 @@ static int pxa_camera_check_frame(u32 width, u32 height)
(width & 0x01);
}
-static int pxa_camera_set_crop(struct soc_camera_device *icd,
- const struct v4l2_crop *a)
-{
- const struct v4l2_rect *rect = &a->c;
- struct device *dev = icd->parent;
- struct soc_camera_host *ici = to_soc_camera_host(dev);
- struct pxa_camera_dev *pcdev = ici->priv;
- struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
- struct soc_camera_sense sense = {
- .master_clock = pcdev->mclk,
- .pixel_clock_max = pcdev->ciclk / 4,
- };
- struct v4l2_subdev_format fmt = {
- .which = V4L2_SUBDEV_FORMAT_ACTIVE,
- };
- struct v4l2_mbus_framefmt *mf = &fmt.format;
- struct pxa_cam *cam = icd->host_priv;
- u32 fourcc = icd->current_fmt->host_fmt->fourcc;
- 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 = sensor_call(pcdev, video, s_crop, a);
-
- icd->sense = NULL;
-
- if (ret < 0) {
- dev_warn(pcdev_to_dev(pcdev), "Failed to crop to %ux%u@%u:%u\n",
- rect->width, rect->height, rect->left, rect->top);
- return ret;
- }
-
- ret = sensor_call(pcdev, pad, get_fmt, NULL, &fmt);
- if (ret < 0)
- return ret;
-
- if (pxa_camera_check_frame(mf->width, mf->height)) {
- /*
- * Camera cropping produced a frame beyond our capabilities.
- * FIXME: just extract a subframe, that we can process.
- */
- v4l_bound_align_image(&mf->width, 48, 2048, 1,
- &mf->height, 32, 2048, 0,
- fourcc == V4L2_PIX_FMT_YUV422P ? 4 : 0);
- ret = sensor_call(pcdev, pad, set_fmt, NULL, &fmt);
- if (ret < 0)
- return ret;
-
- if (pxa_camera_check_frame(mf->width, mf->height)) {
- dev_warn(pcdev_to_dev(pcdev),
- "Inconsistent state. Use S_FMT to repair\n");
- return -EINVAL;
- }
- }
-
- if (sense.flags & SOCAM_SENSE_PCLK_CHANGED) {
- if (sense.pixel_clock > sense.pixel_clock_max) {
- dev_err(pcdev_to_dev(pcdev),
- "pixel clock %lu set by the camera too high!",
- sense.pixel_clock);
- return -EIO;
- }
- recalculate_fifo_timeout(pcdev, sense.pixel_clock);
- }
-
- icd->user_width = mf->width;
- icd->user_height = mf->height;
-
- pxa_camera_setup_cicr(icd, cam->flags, fourcc);
-
- return ret;
-}
-
static int pxa_camera_set_fmt(struct soc_camera_device *icd,
struct v4l2_format *f)
{
@@ -1581,7 +1506,6 @@ static struct soc_camera_host_ops pxa_soc_camera_host_ops = {
.remove = pxa_camera_remove_device,
.clock_start = pxa_camera_clock_start,
.clock_stop = pxa_camera_clock_stop,
- .set_crop = pxa_camera_set_crop,
.get_formats = pxa_camera_get_formats,
.put_formats = pxa_camera_put_formats,
.set_fmt = pxa_camera_set_fmt,
--
2.1.4
next prev parent reply other threads:[~2016-08-29 18:03 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-29 17:55 [PATCH v5 00/13] pxa_camera transition to v4l2 standalone device Robert Jarzmik
2016-08-29 17:55 ` [PATCH v5 01/13] media: mt9m111: make a standalone v4l2 subdevice Robert Jarzmik
2016-08-30 8:55 ` Guennadi Liakhovetski
2016-08-30 15:57 ` Robert Jarzmik
2016-08-29 17:55 ` [PATCH v5 02/13] media: mt9m111: use only the SRGB colorspace Robert Jarzmik
2016-08-29 17:55 ` [PATCH v5 03/13] media: mt9m111: move mt9m111 out of soc_camera Robert Jarzmik
2016-08-30 8:37 ` Guennadi Liakhovetski
2016-08-29 17:55 ` [PATCH v5 04/13] media: platform: pxa_camera: convert to vb2 Robert Jarzmik
2016-08-29 17:55 ` [PATCH v5 05/13] media: platform: pxa_camera: trivial move of functions Robert Jarzmik
2016-08-29 17:55 ` [PATCH v5 06/13] media: platform: pxa_camera: introduce sensor_call Robert Jarzmik
2016-08-29 17:55 ` [PATCH v5 07/13] media: platform: pxa_camera: make printk consistent Robert Jarzmik
2016-08-29 17:55 ` [PATCH v5 08/13] media: platform: pxa_camera: add buffer sequencing Robert Jarzmik
2016-08-29 17:55 ` Robert Jarzmik [this message]
2016-08-29 17:55 ` [PATCH v5 10/13] media: platform: pxa_camera: make a standalone v4l2 device Robert Jarzmik
2016-08-29 17:55 ` [PATCH v5 11/13] media: platform: pxa_camera: add debug register access Robert Jarzmik
2016-08-29 17:55 ` [PATCH v5 12/13] media: platform: pxa_camera: change stop_streaming semantics Robert Jarzmik
2016-08-29 17:55 ` [PATCH v5 13/13] media: platform: pxa_camera: move pxa_camera out of soc_camera Robert Jarzmik
2016-09-05 12:40 ` [PATCH v5 00/13] pxa_camera transition to v4l2 standalone device Hans Verkuil
2016-09-06 8:49 ` Robert Jarzmik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1472493358-24618-10-git-send-email-robert.jarzmik@free.fr \
--to=robert.jarzmik@free.fr \
--cc=g.liakhovetski@gmx.de \
--cc=hverkuil@xs4all.nl \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=trivial@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).