From patchwork Wed Jun 3 13:59:56 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Towle X-Patchwork-Id: 29996 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1Z09E0-0002f0-Jr; Wed, 03 Jun 2015 16:00:56 +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-5) with esmtp id 1Z09Dy-0005Lj-8z; Wed, 03 Jun 2015 16:00:56 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932201AbbFCOAo (ORCPT + 1 other); Wed, 3 Jun 2015 10:00:44 -0400 Received: from 82-70-136-246.dsl.in-addr.zen.co.uk ([82.70.136.246]:50757 "EHLO xk120.dyn.ducie.codethink.co.uk" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756010AbbFCOAN (ORCPT ); Wed, 3 Jun 2015 10:00:13 -0400 Received: from william by xk120.dyn.ducie.codethink.co.uk with local (Exim 4.80) (envelope-from ) id 1Z09DC-0000XJ-A7; Wed, 03 Jun 2015 15:00:06 +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 09/15] media: soc_camera pad-aware driver initialisation Date: Wed, 3 Jun 2015 14:59:56 +0100 Message-Id: <1433340002-1691-10-git-send-email-william.towle@codethink.co.uk> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1433340002-1691-1-git-send-email-william.towle@codethink.co.uk> References: <1433340002-1691-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.6.3.135416 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODY_SIZE_5000_5999 0, BODY_SIZE_7000_LESS 0, REFERENCES 0, URI_ENDS_IN_HTML 0, __ANY_URI 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 ' Add detection of source pad number for drivers aware of the media controller API, so that the combination of soc_camera and rcar_vin can create device nodes to support modern drivers such as adv7604.c (for HDMI on Lager) and the converted adv7180.c (for composite) underneath. Building rcar_vin gains a dependency on CONFIG_MEDIA_CONTROLLER, in line with requirements for building the drivers associated with it. Signed-off-by: William Towle Signed-off-by: Rob Taylor --- drivers/media/platform/soc_camera/Kconfig | 1 + drivers/media/platform/soc_camera/rcar_vin.c | 1 + drivers/media/platform/soc_camera/soc_camera.c | 46 ++++++++++++++++++++++++ include/media/soc_camera.h | 1 + 4 files changed, 49 insertions(+) diff --git a/drivers/media/platform/soc_camera/Kconfig b/drivers/media/platform/soc_camera/Kconfig index f2776cd..5c45c83 100644 --- a/drivers/media/platform/soc_camera/Kconfig +++ b/drivers/media/platform/soc_camera/Kconfig @@ -38,6 +38,7 @@ config VIDEO_RCAR_VIN depends on VIDEO_DEV && SOC_CAMERA depends on ARCH_SHMOBILE || COMPILE_TEST depends on HAS_DMA + depends on MEDIA_CONTROLLER select VIDEOBUF2_DMA_CONTIG select SOC_CAMERA_SCALE_CROP ---help--- diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c index 16352a8..00c1034 100644 --- a/drivers/media/platform/soc_camera/rcar_vin.c +++ b/drivers/media/platform/soc_camera/rcar_vin.c @@ -1359,6 +1359,7 @@ static int rcar_vin_get_formats(struct soc_camera_device *icd, unsigned int idx, struct device *dev = icd->parent; int shift; + fmt.pad = icd->src_pad_idx; ret = v4l2_subdev_call(sd, pad, get_fmt, NULL, &fmt); if (ret < 0) return ret; diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c index d708df4..c4952c8 100644 --- a/drivers/media/platform/soc_camera/soc_camera.c +++ b/drivers/media/platform/soc_camera/soc_camera.c @@ -1293,6 +1293,9 @@ static int soc_camera_probe_finish(struct soc_camera_device *icd) .which = V4L2_SUBDEV_FORMAT_ACTIVE, }; struct v4l2_mbus_framefmt *mf = &fmt.format; +#if defined(CONFIG_MEDIA_CONTROLLER) + struct media_pad pad; +#endif int ret; sd->grp_id = soc_camera_grp_id(icd); @@ -1310,8 +1313,40 @@ static int soc_camera_probe_finish(struct soc_camera_device *icd) return ret; } + icd->src_pad_idx = -1; +#if defined(CONFIG_MEDIA_CONTROLLER) /* At this point client .probe() should have run already */ + ret = media_entity_init(&icd->vdev->entity, 1, &pad, 0); + if (ret < 0) { + goto eusrfmt; + } else { + int pad_idx; + + for (pad_idx = 0; pad_idx < sd->entity.num_pads; pad_idx++) + if (sd->entity.pads[pad_idx].flags + == MEDIA_PAD_FL_SOURCE) + break; + if (pad_idx >= sd->entity.num_pads) + goto eusrfmt; + + ret = media_entity_create_link(&icd->vdev->entity, 0, + &sd->entity, pad_idx, + MEDIA_LNK_FL_IMMUTABLE | + MEDIA_LNK_FL_ENABLED); + if (ret < 0) + goto eusrfmt; + + icd->src_pad_idx = pad_idx; + ret = soc_camera_init_user_formats(icd); + if (ret < 0) { + icd->src_pad_idx = -1; + goto eusrfmt; + } + } +#else ret = soc_camera_init_user_formats(icd); +#endif + if (ret < 0) goto eusrfmt; @@ -1322,6 +1357,9 @@ static int soc_camera_probe_finish(struct soc_camera_device *icd) goto evidstart; /* Try to improve our guess of a reasonable window format */ +#if defined(CONFIG_MEDIA_CONTROLLER) + fmt.pad = icd->src_pad_idx; +#endif if (!v4l2_subdev_call(sd, pad, get_fmt, NULL, &fmt)) { icd->user_width = mf->width; icd->user_height = mf->height; @@ -1335,6 +1373,9 @@ static int soc_camera_probe_finish(struct soc_camera_device *icd) evidstart: soc_camera_free_user_formats(icd); eusrfmt: +#if defined(CONFIG_MEDIA_CONTROLLER) + media_entity_cleanup(&icd->vdev->entity); +#endif soc_camera_remove_device(icd); return ret; @@ -1856,6 +1897,11 @@ static int soc_camera_remove(struct soc_camera_device *icd) if (icd->num_user_formats) soc_camera_free_user_formats(icd); +#if defined(CONFIG_MEDIA_CONTROLLER) + if (icd->vdev->entity.num_pads) + media_entity_cleanup(&icd->vdev->entity); +#endif + if (icd->clk) { /* For the synchronous case */ v4l2_clk_unregister(icd->clk); diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h index 2f6261f..30193cf 100644 --- a/include/media/soc_camera.h +++ b/include/media/soc_camera.h @@ -42,6 +42,7 @@ struct soc_camera_device { unsigned char devnum; /* Device number per host */ struct soc_camera_sense *sense; /* See comment in struct definition */ struct video_device *vdev; + int src_pad_idx; /* For media-controller drivers */ struct v4l2_ctrl_handler ctrl_handler; const struct soc_camera_format_xlate *current_fmt; struct soc_camera_format_xlate *user_formats;