From patchwork Thu Apr 27 22:41:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 9703657 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0DBDC60225 for ; Thu, 27 Apr 2017 22:43:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C56B42846F for ; Thu, 27 Apr 2017 22:43:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BA5FE28649; Thu, 27 Apr 2017 22:43:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 494562846F for ; Thu, 27 Apr 2017 22:43:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1162446AbdD0Wnk (ORCPT ); Thu, 27 Apr 2017 18:43:40 -0400 Received: from smtp-4.sys.kth.se ([130.237.48.193]:57457 "EHLO smtp-4.sys.kth.se" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1032849AbdD0Wm6 (ORCPT ); Thu, 27 Apr 2017 18:42:58 -0400 Received: from smtp-4.sys.kth.se (localhost.localdomain [127.0.0.1]) by smtp-4.sys.kth.se (Postfix) with ESMTP id D3CC0332D; Fri, 28 Apr 2017 00:42:56 +0200 (CEST) X-Virus-Scanned: by amavisd-new at kth.se Received: from smtp-4.sys.kth.se ([127.0.0.1]) by smtp-4.sys.kth.se (smtp-4.sys.kth.se [127.0.0.1]) (amavisd-new, port 10024) with LMTP id x_eK5Z8hM5tW; Fri, 28 Apr 2017 00:42:55 +0200 (CEST) X-KTH-Auth: niso [89.233.230.99] X-KTH-mail-from: niklas.soderlund+renesas@ragnatech.se Received: from bismarck.berto.se (unknown [89.233.230.99]) by smtp-4.sys.kth.se (Postfix) with ESMTPSA id 736C7BC6; Fri, 28 Apr 2017 00:42:55 +0200 (CEST) From: =?UTF-8?q?Niklas=20S=C3=B6derlund?= To: Laurent Pinchart , Hans Verkuil Cc: linux-media@vger.kernel.org, linux-renesas-soc@vger.kernel.org, tomoharu.fukawa.eb@renesas.com, Sakari Ailus , Geert Uytterhoeven , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Kieran Bingham Subject: [PATCH v4 21/27] rcar-vin: add group allocator functions Date: Fri, 28 Apr 2017 00:41:57 +0200 Message-Id: <20170427224203.14611-22-niklas.soderlund+renesas@ragnatech.se> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170427224203.14611-1-niklas.soderlund+renesas@ragnatech.se> References: <20170427224203.14611-1-niklas.soderlund+renesas@ragnatech.se> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In media controller mode all VIN instances needs to be part of the same media graph. There is also a need to each VIN instance to know and in some cases be able to communicate with other VIN instances. Add a allocator framework where the first VIN instance to be probed creates a shared data structure and creates a media device. Signed-off-by: Niklas Söderlund --- drivers/media/platform/rcar-vin/rcar-core.c | 112 +++++++++++++++++++++++++++- drivers/media/platform/rcar-vin/rcar-vin.h | 38 ++++++++++ 2 files changed, 147 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/rcar-vin/rcar-core.c b/drivers/media/platform/rcar-vin/rcar-core.c index f560d27449b84882..c10770d5ec37816c 100644 --- a/drivers/media/platform/rcar-vin/rcar-core.c +++ b/drivers/media/platform/rcar-vin/rcar-core.c @@ -20,12 +20,110 @@ #include #include #include +#include #include #include "rcar-vin.h" /* ----------------------------------------------------------------------------- + * Gen3 CSI2 Group Allocator + */ + +static DEFINE_MUTEX(rvin_group_lock); +static struct rvin_group *rvin_group_data; + +static void rvin_group_release(struct kref *kref) +{ + struct rvin_group *group = + container_of(kref, struct rvin_group, refcount); + + mutex_lock(&rvin_group_lock); + + media_device_unregister(&group->mdev); + media_device_cleanup(&group->mdev); + + rvin_group_data = NULL; + + mutex_unlock(&rvin_group_lock); + + kfree(group); +} + +static struct rvin_group *__rvin_group_allocate(struct rvin_dev *vin) +{ + struct rvin_group *group; + + if (rvin_group_data) { + group = rvin_group_data; + kref_get(&group->refcount); + vin_dbg(vin, "%s: get group=%p\n", __func__, group); + return group; + } + + group = kzalloc(sizeof(*group), GFP_KERNEL); + if (!group) + return NULL; + + kref_init(&group->refcount); + rvin_group_data = group; + + vin_dbg(vin, "%s: alloc group=%p\n", __func__, group); + return group; +} + +static struct rvin_group *rvin_group_allocate(struct rvin_dev *vin) +{ + struct rvin_group *group; + struct media_device *mdev; + int ret; + + mutex_lock(&rvin_group_lock); + + group = __rvin_group_allocate(vin); + if (!group) { + mutex_unlock(&rvin_group_lock); + return ERR_PTR(-ENOMEM); + } + + /* Init group data if its not already initialized */ + mdev = &group->mdev; + if (!mdev->dev) { + mutex_init(&group->lock); + mdev->dev = vin->dev; + + strlcpy(mdev->driver_name, "Renesas VIN", + sizeof(mdev->driver_name)); + strlcpy(mdev->model, vin->dev->of_node->name, + sizeof(mdev->model)); + strlcpy(mdev->bus_info, of_node_full_name(vin->dev->of_node), + sizeof(mdev->bus_info)); + mdev->driver_version = LINUX_VERSION_CODE; + media_device_init(mdev); + + ret = media_device_register(mdev); + if (ret) { + vin_err(vin, "Failed to register media device\n"); + kref_put(&group->refcount, rvin_group_release); + mutex_unlock(&rvin_group_lock); + return ERR_PTR(ret); + } + } + + vin->v4l2_dev.mdev = mdev; + + mutex_unlock(&rvin_group_lock); + + return group; +} + +static void rvin_group_delete(struct rvin_dev *vin) +{ + vin_dbg(vin, "%s: group=%p\n", __func__, &vin->group); + kref_put(&vin->group->refcount, rvin_group_release); +} + +/* ----------------------------------------------------------------------------- * Async notifier */ @@ -263,9 +361,13 @@ static int rvin_group_init(struct rvin_dev *vin) { int ret; + vin->group = rvin_group_allocate(vin); + if (IS_ERR(vin->group)) + return PTR_ERR(vin->group); + ret = rvin_v4l2_mc_probe(vin); if (ret) - return ret; + goto error_group; vin->pad.flags = MEDIA_PAD_FL_SINK; ret = media_entity_pads_init(&vin->vdev->entity, 1, &vin->pad); @@ -275,6 +377,8 @@ static int rvin_group_init(struct rvin_dev *vin) return 0; error_v4l2: rvin_v4l2_mc_remove(vin); +error_group: + rvin_group_delete(vin); return ret; } @@ -398,10 +502,12 @@ static int rcar_vin_remove(struct platform_device *pdev) v4l2_async_notifier_unregister(&vin->notifier); - if (vin->info->use_mc) + if (vin->info->use_mc) { rvin_v4l2_mc_remove(vin); - else + rvin_group_delete(vin); + } else { rvin_v4l2_remove(vin); + } rvin_dma_remove(vin); diff --git a/drivers/media/platform/rcar-vin/rcar-vin.h b/drivers/media/platform/rcar-vin/rcar-vin.h index 06934313950253f4..21b6c9292686e41a 100644 --- a/drivers/media/platform/rcar-vin/rcar-vin.h +++ b/drivers/media/platform/rcar-vin/rcar-vin.h @@ -17,6 +17,8 @@ #ifndef __RCAR_VIN__ #define __RCAR_VIN__ +#include + #include #include #include @@ -30,6 +32,9 @@ /* Address alignment mask for HW buffers */ #define HW_BUFFER_MASK 0x7f +/* Max number on VIN instances that can be in a system */ +#define RCAR_VIN_NUM 8 + enum chip_id { RCAR_H1, RCAR_M1, @@ -37,6 +42,15 @@ enum chip_id { RCAR_GEN3, }; +enum rvin_csi_id { + RVIN_CSI20, + RVIN_CSI21, + RVIN_CSI40, + RVIN_CSI41, + RVIN_CSI_MAX, + RVIN_NC, /* Not Connected */ +}; + /** * STOPPED - No operation in progress * RUNNING - Operation in progress have buffers @@ -75,6 +89,8 @@ struct rvin_graph_entity { unsigned int sink_pad; }; +struct rvin_group; + /** * struct rvin_info- Information about the particular VIN implementation * @chip: type of VIN chip @@ -103,6 +119,7 @@ struct rvin_info { * @notifier: V4L2 asynchronous subdevs notifier * @digital: entity in the DT for local digital subdevice * + * @group: Gen3 CSI group * @pad: pad for media controller * * @lock: protects @queue @@ -134,6 +151,7 @@ struct rvin_dev { struct v4l2_async_notifier notifier; struct rvin_graph_entity digital; + struct rvin_group *group; struct media_pad pad; struct mutex lock; @@ -162,6 +180,26 @@ struct rvin_dev { #define vin_warn(d, fmt, arg...) dev_warn(d->dev, fmt, ##arg) #define vin_err(d, fmt, arg...) dev_err(d->dev, fmt, ##arg) +/** + * struct rvin_group - VIN CSI2 group information + * @refcount: number of VIN instances using the group + * + * @mdev: media device which represents the group + * + * @lock: protects the vin and csi members + * @vin: VIN instances which are part of the group + * @csi: CSI-2 entities that are part of the group + */ +struct rvin_group { + struct kref refcount; + + struct media_device mdev; + + struct mutex lock; + struct rvin_dev *vin[RCAR_VIN_NUM]; + struct rvin_graph_entity csi[RVIN_CSI_MAX]; +}; + int rvin_dma_probe(struct rvin_dev *vin, int irq); void rvin_dma_remove(struct rvin_dev *vin);