From: William Towle <william.towle@codethink.co.uk>
To: linux-media@vger.kernel.org, linux-kernel@lists.codethink.co.uk
Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>,
Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>,
Hans Verkuil <hverkuil@xs4all.nl>
Subject: [PATCH 10/15] media: rcar_vin: Use correct pad number in try_fmt
Date: Wed, 27 May 2015 17:10:48 +0100 [thread overview]
Message-ID: <1432743053-13479-11-git-send-email-william.towle@codethink.co.uk> (raw)
In-Reply-To: <1432743053-13479-1-git-send-email-william.towle@codethink.co.uk>
Fix rcar_vin_try_fmt to use the correct pad number when calling the
subdev set_fmt. Previously pad number 0 was always used, resulting in
EINVAL if the subdev cares about the pad number (e.g. ADV7612).
Signed-off-by: William Towle <william.towle@codethink.co.uk>
Reviewed-by: Rob Taylor <rob.taylor@codethink.co.uk>
---
drivers/media/platform/soc_camera/rcar_vin.c | 36 ++++++++++++++++++++++----
1 file changed, 31 insertions(+), 5 deletions(-)
diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c
index 0df3212..5523d04 100644
--- a/drivers/media/platform/soc_camera/rcar_vin.c
+++ b/drivers/media/platform/soc_camera/rcar_vin.c
@@ -1702,7 +1702,7 @@ static int rcar_vin_try_fmt(struct soc_camera_device *icd,
const struct soc_camera_format_xlate *xlate;
struct v4l2_pix_format *pix = &f->fmt.pix;
struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
- struct v4l2_subdev_pad_config pad_cfg;
+ struct v4l2_subdev_pad_config *pad_cfg = NULL;
struct v4l2_subdev_format format = {
.which = V4L2_SUBDEV_FORMAT_TRY,
};
@@ -1710,6 +1710,11 @@ static int rcar_vin_try_fmt(struct soc_camera_device *icd,
__u32 pixfmt = pix->pixelformat;
int width, height;
int ret;
+#if defined(CONFIG_MEDIA_CONTROLLER)
+ struct media_pad *remote_pad;
+
+ pad_cfg = v4l2_subdev_alloc_pad_config(sd);
+#endif
xlate = soc_camera_xlate_by_fourcc(icd, pixfmt);
if (!xlate) {
@@ -1739,10 +1744,22 @@ static int rcar_vin_try_fmt(struct soc_camera_device *icd,
mf->code = xlate->code;
mf->colorspace = pix->colorspace;
- ret = v4l2_device_call_until_err(sd->v4l2_dev, soc_camera_grp_id(icd),
- pad, set_fmt, &pad_cfg, &format);
- if (ret < 0)
+#if defined(CONFIG_MEDIA_CONTROLLER)
+ remote_pad = media_entity_remote_pad(
+ &icd->vdev->entity.pads[0]);
+ format.pad = remote_pad->index;
+#endif
+
+ ret = v4l2_device_call_until_err(sd->v4l2_dev,
+ soc_camera_grp_id(icd), pad,
+ set_fmt, pad_cfg,
+ &format);
+ if (ret < 0) {
+#if defined(CONFIG_MEDIA_CONTROLLER)
+ v4l2_subdev_free_pad_config(pad_cfg);
+#endif
return ret;
+ }
/* Adjust only if VIN cannot scale */
if (pix->width > mf->width * 2)
@@ -1764,13 +1781,19 @@ static int rcar_vin_try_fmt(struct soc_camera_device *icd,
*/
mf->width = VIN_MAX_WIDTH;
mf->height = VIN_MAX_HEIGHT;
+#if defined(CONFIG_MEDIA_CONTROLLER)
+ format.pad = remote_pad->index;
+#endif
ret = v4l2_device_call_until_err(sd->v4l2_dev,
soc_camera_grp_id(icd),
- pad, set_fmt, &pad_cfg,
+ pad, set_fmt, pad_cfg,
&format);
if (ret < 0) {
dev_err(icd->parent,
"client try_fmt() = %d\n", ret);
+#if defined(CONFIG_MEDIA_CONTROLLER)
+ v4l2_subdev_free_pad_config(pad_cfg);
+#endif
return ret;
}
}
@@ -1781,6 +1804,9 @@ static int rcar_vin_try_fmt(struct soc_camera_device *icd,
pix->height = height;
}
+#if defined(CONFIG_MEDIA_CONTROLLER)
+ v4l2_subdev_free_pad_config(pad_cfg);
+#endif
return ret;
}
--
1.7.10.4
next prev parent reply other threads:[~2015-05-27 16:11 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-27 16:10 HDMI and Composite capture on Lager, for kernel 4.1, version 2 William Towle
2015-05-27 16:10 ` [PATCH 01/15] ARM: shmobile: lager dts: Add entries for VIN HDMI input support William Towle
2015-05-27 16:10 ` [PATCH 02/15] media: soc_camera: rcar_vin: Add BT.709 24-bit RGB888 " William Towle
2015-05-27 16:10 ` [PATCH 03/15] media: adv7180: add of match table William Towle
2015-05-27 16:10 ` [PATCH 04/15] media: adv7604: chip info and formats for ADV7612 William Towle
2015-05-27 16:10 ` [PATCH 05/15] media: adv7604: document support for ADV7612 dual HDMI input decoder William Towle
2015-05-27 16:10 ` [PATCH 06/15] media: adv7604: ability to read default input port from DT William Towle
2015-05-27 16:10 ` [PATCH 07/15] ARM: shmobile: lager dts: specify default-input for ADV7612 William Towle
2015-05-27 16:10 ` [PATCH 08/15] v4l: subdev: Add pad config allocator and init William Towle
2015-05-27 16:10 ` [PATCH 09/15] media: soc_camera pad-aware driver initialisation William Towle
2015-05-27 16:10 ` William Towle [this message]
2015-05-29 10:24 ` [PATCH 10/15] media: rcar_vin: Use correct pad number in try_fmt Hans Verkuil
2015-05-27 16:10 ` [PATCH 11/15] media: soc_camera: soc_scale_crop: Use correct pad when calling subdev try_fmt William Towle
2015-05-27 16:10 ` [PATCH 12/15] media: soc_camera: Fill std field in enum_input William Towle
2015-05-27 16:10 ` [PATCH 13/15] media: soc_camera: Fix error reporting in expbuf William Towle
2015-05-27 16:10 ` [PATCH 14/15] media: soc_camera: v4l2-compliance fixes for querycap William Towle
2015-05-27 16:10 ` [PATCH 15/15] media: rcar_vin: Reject videobufs that are too small for current format William Towle
2015-06-03 13:59 HDMI and Composite capture on Lager, for kernel 4.1, version 3 William Towle
2015-06-03 13:59 ` [PATCH 10/15] media: rcar_vin: Use correct pad number in try_fmt William Towle
2015-06-12 9:17 ` Hans Verkuil
2015-06-20 10:59 ` Guennadi Liakhovetski
2015-06-25 9:30 HDMI and Composite capture on Lager, for kernel 4.1, version 4 William Towle
2015-06-25 9:31 ` [PATCH 10/15] media: rcar_vin: Use correct pad number in try_fmt William Towle
2015-07-12 12:23 ` Guennadi Liakhovetski
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=1432743053-13479-11-git-send-email-william.towle@codethink.co.uk \
--to=william.towle@codethink.co.uk \
--cc=g.liakhovetski@gmx.de \
--cc=hverkuil@xs4all.nl \
--cc=linux-kernel@lists.codethink.co.uk \
--cc=linux-media@vger.kernel.org \
--cc=sergei.shtylyov@cogentembedded.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.