From patchwork Thu Apr 14 16:17:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulrich Hecht X-Patchwork-Id: 8839441 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: X-Original-To: patchwork-linux-renesas-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 47B039F36E for ; Thu, 14 Apr 2016 16:18:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C3E98201B9 for ; Thu, 14 Apr 2016 16:18:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 130FD20160 for ; Thu, 14 Apr 2016 16:18:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755784AbcDNQSL (ORCPT ); Thu, 14 Apr 2016 12:18:11 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:34844 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932799AbcDNQSI (ORCPT ); Thu, 14 Apr 2016 12:18:08 -0400 Received: by mail-wm0-f66.google.com with SMTP id a140so24288029wma.2; Thu, 14 Apr 2016 09:18:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=gXbNMXuJ1HsUkWeczgH2wOzQwe9GiM0E8t2otQn3gp8=; b=G3FD3ff/hsutYoSbzJ7deNtu1G3OalHZLQgdHnIPaUTNeBK0sErjfB6DUz4h4BF/LS B9nW7bj1Yq4R/7YkvTNPDlYqX6YGkb63xTgNAtJ9dz/2QWDCTUEG+hSMmx2vC2M5a153 HNE6pnr+0mRhx0yV7SIAY1Z8hX5My/4mLxyogghBbYmrA/+qMAnx6QMBsOgvaALZE9/D DxLLY46Dod8kdNJIqMX3cocomeYzSSH/SCgSG1B1tOuBBznCJAQzsMverMzUYuDxSewu egbGXpWOiZKEAhVelhQtBFZWy9b9HF9p+asT2PkIpzJV9cFPXRXAeHknVMdKHGSRPpaZ tzxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=gXbNMXuJ1HsUkWeczgH2wOzQwe9GiM0E8t2otQn3gp8=; b=KLS4awOdxdOeyvbXUQasNFyil8lmiXJI7smj0hyflhdSTvowrkZx+xAUfjaM5beiTr eHbUnedMW1bEfFjMwwCtFHO9G5ZzFYLKvedv2q4vFv6hWdDGzGxerHlNQY+D6O61TWMu 0abZganY/ZhbPIsqFpXC5I7Aw8Hd/rk9bSv9q30yzF5eJIw77EXwhuupNWyrzwjkpW7R h3XO6cEnrCxPMof+w9PsLKJi7oVE9YZ5Te1H/xx5RyQpBaRZeo5DJes2btQXiP2Lc0Cg +tIDGSxLCid7Y93aGwKXK6OTPHYgtTDTEVshBHsDZZS9Ump3wRtCFAlCcXRT72U+Wi3+ GMfg== X-Gm-Message-State: AOPr4FVGsu9wj5Rw4Zj4Q8YPkmLA67GwPYElDCK2Le5FwbJr6NOEKHg1IMIkjc+D3gODqQ== X-Received: by 10.28.49.3 with SMTP id x3mr17323041wmx.4.1460650686830; Thu, 14 Apr 2016 09:18:06 -0700 (PDT) Received: from groucho.site (ip9234e209.dynamic.kabel-deutschland.de. [146.52.226.9]) by smtp.gmail.com with ESMTPSA id j10sm44720459wjb.46.2016.04.14.09.18.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 14 Apr 2016 09:18:06 -0700 (PDT) From: Ulrich Hecht To: hans.verkuil@cisco.com, niklas.soderlund@ragnatech.se Cc: linux-media@vger.kernel.org, linux-renesas-soc@vger.kernel.org, magnus.damm@gmail.com, laurent.pinchart@ideasonboard.com, ian.molton@codethink.co.uk, lars@metafoo.de, william.towle@codethink.co.uk, Ulrich Hecht , Rob Taylor Subject: [PATCH v3 4/7] media: rcar-vin: pad-aware driver initialisation Date: Thu, 14 Apr 2016 18:17:47 +0200 Message-Id: <1460650670-20849-5-git-send-email-ulrich.hecht+renesas@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1460650670-20849-1-git-send-email-ulrich.hecht+renesas@gmail.com> References: <1460650670-20849-1-git-send-email-ulrich.hecht+renesas@gmail.com> Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add detection of source pad number for drivers aware of the media controller API, so that 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 [uli: adapted to rcar-vin rewrite] Signed-off-by: Ulrich Hecht --- drivers/media/platform/rcar-vin/rcar-v4l2.c | 16 ++++++++++++++++ drivers/media/platform/rcar-vin/rcar-vin.h | 2 ++ 2 files changed, 18 insertions(+) diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c b/drivers/media/platform/rcar-vin/rcar-v4l2.c index 43aec3c..d8d5f3a 100644 --- a/drivers/media/platform/rcar-vin/rcar-v4l2.c +++ b/drivers/media/platform/rcar-vin/rcar-v4l2.c @@ -659,6 +659,9 @@ int rvin_v4l2_probe(struct rvin_dev *vin) struct v4l2_mbus_framefmt *mf = &fmt.format; struct video_device *vdev = &vin->vdev; struct v4l2_subdev *sd = vin_to_sd(vin); +#if defined(CONFIG_MEDIA_CONTROLLER) + int pad_idx; +#endif int ret; v4l2_set_subdev_hostdata(sd, vin); @@ -701,6 +704,19 @@ int rvin_v4l2_probe(struct rvin_dev *vin) vdev->lock = &vin->lock; vdev->ctrl_handler = &vin->ctrl_handler; + vin->src_pad_idx = 0; +#if defined(CONFIG_MEDIA_CONTROLLER) + 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) + return -EINVAL; + + vin->src_pad_idx = pad_idx; +#endif + fmt.pad = vin->src_pad_idx; + /* Try to improve our guess of a reasonable window format */ ret = v4l2_subdev_call(sd, pad, get_fmt, NULL, &fmt); if (ret) { diff --git a/drivers/media/platform/rcar-vin/rcar-vin.h b/drivers/media/platform/rcar-vin/rcar-vin.h index 01c5086..959f5da 100644 --- a/drivers/media/platform/rcar-vin/rcar-vin.h +++ b/drivers/media/platform/rcar-vin/rcar-vin.h @@ -87,6 +87,7 @@ struct rvin_graph_entity { * * @vdev: V4L2 video device associated with VIN * @v4l2_dev: V4L2 device + * @src_pad_idx: source pad index for media controller drivers * @ctrl_handler: V4L2 control handler * @notifier: V4L2 asynchronous subdevs notifier * @entity: entity in the DT for subdevice @@ -118,6 +119,7 @@ struct rvin_dev { struct video_device vdev; struct v4l2_device v4l2_dev; + int src_pad_idx; struct v4l2_ctrl_handler ctrl_handler; struct v4l2_async_notifier notifier; struct rvin_graph_entity entity;