From patchwork Wed May 27 16:10:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Towle X-Patchwork-Id: 29870 X-Patchwork-Delegate: g.liakhovetski@gmx.de Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1YxdvS-0003ma-UB; Wed, 27 May 2015 18:11:26 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.76/mailfrontend-6) with esmtp id 1YxdvR-0000ve-3T; Wed, 27 May 2015 18:11:26 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752717AbbE0QLQ (ORCPT + 1 other); Wed, 27 May 2015 12:11:16 -0400 Received: from 82-70-136-246.dsl.in-addr.zen.co.uk ([82.70.136.246]:52408 "EHLO xk120.dyn.ducie.codethink.co.uk" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752344AbbE0QLA (ORCPT ); Wed, 27 May 2015 12:11:00 -0400 Received: from william by xk120.dyn.ducie.codethink.co.uk with local (Exim 4.80) (envelope-from ) id 1Yxdv0-0005GN-Hy; Wed, 27 May 2015 17:10:58 +0100 From: William Towle To: linux-media@vger.kernel.org, linux-kernel@lists.codethink.co.uk Cc: Guennadi Liakhovetski , Sergei Shtylyov , Hans Verkuil Subject: [PATCH 10/15] media: rcar_vin: Use correct pad number in try_fmt Date: Wed, 27 May 2015 17:10:48 +0100 Message-Id: <1432743053-13479-11-git-send-email-william.towle@codethink.co.uk> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1432743053-13479-1-git-send-email-william.towle@codethink.co.uk> References: <1432743053-13479-1-git-send-email-william.towle@codethink.co.uk> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2015.5.27.160315 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODY_SIZE_3000_3999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, REFERENCES 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __REFERENCES 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' 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 Reviewed-by: Rob Taylor --- 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; }