From patchwork Thu May 25 00:29:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Longerbeam X-Patchwork-Id: 9747341 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 A417E601E9 for ; Thu, 25 May 2017 00:34:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 93F7226C9B for ; Thu, 25 May 2017 00:34:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 87ED926E56; Thu, 25 May 2017 00:34:00 +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=-1.9 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0EEF626E3A for ; Thu, 25 May 2017 00:34:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=1zTuBbNljFHIv/SgOhy+Lamb4Pt7BaNq/XYNXIQe818=; b=CdE7KiGEtej1MVi16fLMvqqei+ HXd+rWVK1EtfelcIMWEQsa9+G8bTUORuv/AVtQymJZfrL6Iq+Gh3wyjzf1wmDgBY0Yw5WZTVU4vOj R9gsDxy315BXCcBI+agsMgt4lX0gbGnPutoemJalwOhGEq5QnDp0VbsWUCztYaS3TjnaDDOAqq5R2 EsDzYAe/XtnKhWmVDNzzudBIyjGX1mkqohuUtwaLR+ABlRMNRUTtp90QPoqHZc/g29IqlZUIcB7oV QSOVKuW9+AueVr85ET1Je2Qj0zsT1YpTp9dcaKXRYvLK+rUGBqf6Wk4Nl10FnhVBIjSfNA7zPZA8Y 3rNLrzsw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dDgj0-0003T2-S6; Thu, 25 May 2017 00:33:58 +0000 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dDgg6-0008BD-M3 for linux-arm-kernel@lists.infradead.org; Thu, 25 May 2017 00:31:00 +0000 Received: by mail-pf0-x242.google.com with SMTP id u26so35367636pfd.2 for ; Wed, 24 May 2017 17:30:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Y37z9FClli9uRq4cuyOWXEmyo+D4nDsZ3O2lPmk+CcY=; b=Tqnq0Gu3c8exGHui81PnSCyF2l0+7fsD/skC1GASuJjsb2TS+kpiHEVfqWEv5eQkmU KSRGEHe2ViTWK96qtT1j1id0LwHg6QtAfJRTF/GXEE4wpsimPb7TjRXoY3RMMIIaoyda 2JXnxkPtBPQOIaLjwmfICs+B/C/zxITJmbcU46K/2tcAF4aMgqeknUXSk08ecffPhrH6 32otAB7d5Y8rsgPRAluwC07HGeRwdKTj5Uce1LBRqnKyGgwYyBVHoaQKsePW0tgWbgex X2PoOG+1Wg+QoZv4YoKuyXGzf3xKuiZYkzYaORN9qOL/h0TPTCj2t0QbeSXifD3H3dPR B5/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Y37z9FClli9uRq4cuyOWXEmyo+D4nDsZ3O2lPmk+CcY=; b=tl+MndZJPGFzRy26WBMhh3ksYyyJGJFerSmXQAiGl1k26m5U9f7OPRlTHzK77pBB8I WSZP22vju93XYnHsnc1Z3dl/yGJWmSDf0prkJ9/k77zmZKYDGL5ikdERO+GsL9Q1Pm8o PEAxvjAurEhJ6Y9oPOb10Z9LCcsoO1y7DmKaOb5+5wvbWX0wSl8dDf3LVygp1VWTUucW 2DFxsSfnTuX3LXfah5oIpbp0BSlcFuOpP/ufDmvlaAOiFMYwf3xx3ugNTq0FiSWBArpQ lqlvLSV0I3eMrGqqk9ue09/J6I2B3U6by00aBlfDv8ZsR1QPBo4KcN+e+LWxsNa0UhLj t7vw== X-Gm-Message-State: AODbwcCWImeyNVkxCQNG1WttJXwnEbcdm3SqW2urvivOFLwCitMFmTuz 3+WLvdLxK6zskQ== X-Received: by 10.99.152.9 with SMTP id q9mr41440218pgd.131.1495672238399; Wed, 24 May 2017 17:30:38 -0700 (PDT) Received: from mappy.sklembedded.com (c-98-210-181-167.hsd1.ca.comcast.net. [98.210.181.167]) by smtp.googlemail.com with ESMTPSA id q27sm10605716pfk.4.2017.05.24.17.30.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 24 May 2017 17:30:37 -0700 (PDT) From: Steve Longerbeam X-Google-Original-From: Steve Longerbeam To: robh+dt@kernel.org, mark.rutland@arm.com, shawnguo@kernel.org, kernel@pengutronix.de, fabio.estevam@nxp.com, linux@armlinux.org.uk, mchehab@kernel.org, hverkuil@xs4all.nl, nick@shmanahar.org, markus.heiser@darmarIT.de, p.zabel@pengutronix.de, laurent.pinchart+renesas@ideasonboard.com, bparrot@ti.com, geert@linux-m68k.org, arnd@arndb.de, sudipm.mukherjee@gmail.com, minghsiu.tsai@mediatek.com, tiffany.lin@mediatek.com, jean-christophe.trotin@st.com, horms+renesas@verge.net.au, niklas.soderlund+renesas@ragnatech.se, robert.jarzmik@free.fr, songjun.wu@microchip.com, andrew-ct.chen@mediatek.com, gregkh@linuxfoundation.org, shuah@kernel.org, sakari.ailus@linux.intel.com, pavel@ucw.cz Subject: [PATCH v7 15/34] add mux and video interface bridge entity functions Date: Wed, 24 May 2017 17:29:30 -0700 Message-Id: <1495672189-29164-16-git-send-email-steve_longerbeam@mentor.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1495672189-29164-1-git-send-email-steve_longerbeam@mentor.com> References: <1495672189-29164-1-git-send-email-steve_longerbeam@mentor.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170524_173058_755756_D0AA777F X-CRM114-Status: GOOD ( 11.71 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devel@driverdev.osuosl.org, devicetree@vger.kernel.org, Steve Longerbeam , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Philipp Zabel Signed-off-by: Philipp Zabel - renamed MEDIA_ENT_F_MUX to MEDIA_ENT_F_VID_MUX Signed-off-by: Steve Longerbeam --- Documentation/media/uapi/mediactl/media-types.rst | 22 ++++++++++++++++++++++ include/uapi/linux/media.h | 6 ++++++ 2 files changed, 28 insertions(+) diff --git a/Documentation/media/uapi/mediactl/media-types.rst b/Documentation/media/uapi/mediactl/media-types.rst index 2a5164a..47ee003 100644 --- a/Documentation/media/uapi/mediactl/media-types.rst +++ b/Documentation/media/uapi/mediactl/media-types.rst @@ -299,6 +299,28 @@ Types and flags used to represent the media graph elements received on its sink pad and outputs the statistics data on its source pad. + - .. row 29 + + .. _MEDIA-ENT-F-VID-MUX: + + - ``MEDIA_ENT_F_VID_MUX`` + + - Video multiplexer. An entity capable of multiplexing must have at + least two sink pads and one source pad, and must pass the video + frame(s) received from the active sink pad to the source pad. Video + frame(s) from the inactive sink pads are discarded. + + - .. row 30 + + .. _MEDIA-ENT-F-VID-IF-BRIDGE: + + - ``MEDIA_ENT_F_VID_IF_BRIDGE`` + + - Video interface bridge. A video interface bridge entity must have at + least one sink pad and one source pad. It receives video frame(s) on + its sink pad in one bus format (HDMI, eDP, MIPI CSI-2, ...) and + converts them and outputs them on its source pad in another bus format + (eDP, MIPI CSI-2, parallel, ...). .. tabularcolumns:: |p{5.5cm}|p{12.0cm}| diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h index 4890787..fac96c6 100644 --- a/include/uapi/linux/media.h +++ b/include/uapi/linux/media.h @@ -105,6 +105,12 @@ struct media_device_info { #define MEDIA_ENT_F_PROC_VIDEO_STATISTICS (MEDIA_ENT_F_BASE + 0x4006) /* + * Switch and bridge entitites + */ +#define MEDIA_ENT_F_VID_MUX (MEDIA_ENT_F_BASE + 0x5001) +#define MEDIA_ENT_F_VID_IF_BRIDGE (MEDIA_ENT_F_BASE + 0x5002) + +/* * Connectors */ /* It is a responsibility of the entity drivers to add connectors and links */