From patchwork Thu Jul 7 23:03:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Longerbeam X-Patchwork-Id: 9220029 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 13F0A60574 for ; Fri, 8 Jul 2016 05:26:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 068542840B for ; Fri, 8 Jul 2016 05:26:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EF6E928411; Fri, 8 Jul 2016 05:26:43 +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=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 984672840B for ; Fri, 8 Jul 2016 05:26:43 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DB3C86E877; Fri, 8 Jul 2016 05:26:21 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pf0-x244.google.com (mail-pf0-x244.google.com [IPv6:2607:f8b0:400e:c00::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 00DFE6E839 for ; Thu, 7 Jul 2016 23:04:21 +0000 (UTC) Received: by mail-pf0-x244.google.com with SMTP id t190so2907652pfb.2 for ; Thu, 07 Jul 2016 16:04:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Xu5IAFvLM5ZTUq25PBoQgFOqi6pjUHT2/jInIKVf/+w=; b=rJQFt/cjrKfwipl0ZDnHc//y49k8QpAKYOWBvVNXQK4NoavxEv8iHS0gnt8tkNWvcx ufvHmD2hC1Axf6bznC42lSPm1RoZc7WPUiT4DMtNfbgxxYSeXuzRkTUJCqEzqQGV+pHo ROtuNhQ+2+HZxDIBdvlGhM+/2dodIflMH8cNuObgZ4ntSPXmneEoUmLCp57IDGux800Q HyJgCFXwfFTCsVopEUuuNCtF7kMLlPCUoAHo99nswwmpGptOW71K/00+nQB36KcvE2Wz GfAy6oW4V1SbZQ94wwX11ACv+VELcMqUBUiZBfQ1VGMhu97EyHZrXutT1qzfJ+/I7rsJ E1tQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Xu5IAFvLM5ZTUq25PBoQgFOqi6pjUHT2/jInIKVf/+w=; b=dHI2DbPShl+cTmrFiWhM9t6CfDJgsksTbvEZxkGM6mfZS/UZ/FDJOcVfEU+RSXZLLI pedKXl3PLEJgIBqAuLp8OGqWmCCN31ade1PrLNtpSyCQYNWFEG86b5rYU/sBdqSAnJ+F YvCeZ5vGD1jYVRzUfM0vtKFfjBfVGT2wxfIFxcn8XKu1WFeiVmG5q2pXdUCq4qg/gL4W exSHGQOqdTf8eNxzeKdmVsJYTWkniNB2rXcLYfM0lR5nNgLvvEVtPtsJC7gLSdn84roz +EtSNN5w8Fgksk/GOYmAIPGC8bl6vTmdwtKFbe0/vLd82CexMPc+BIT4jv6hS/3e5iN8 n2uQ== X-Gm-Message-State: ALyK8tLxs8Jr72J0Xwwa3fB+zEmsRelt3iAuWl+cJpIv4iGJycMCJbkzbKnBbftXcyTbAw== X-Received: by 10.98.196.18 with SMTP id y18mr4435607pff.163.1467932660366; Thu, 07 Jul 2016 16:04:20 -0700 (PDT) Received: from mothership.sklembedded.com (c-73-241-2-21.hsd1.ca.comcast.net. [73.241.2.21]) by smtp.googlemail.com with ESMTPSA id z29sm6846719pff.0.2016.07.07.16.04.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Jul 2016 16:04:19 -0700 (PDT) From: Steve Longerbeam X-Google-Original-From: Steve Longerbeam To: p.zabel@pengutronix.de Subject: [PATCH 09/16] gpu: ipu-v3: Add ipu_ic_set_src() Date: Thu, 7 Jul 2016 16:03:34 -0700 Message-Id: <1467932621-358-10-git-send-email-steve_longerbeam@mentor.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1467932621-358-1-git-send-email-steve_longerbeam@mentor.com> References: <1467932621-358-1-git-send-email-steve_longerbeam@mentor.com> X-Mailman-Approved-At: Fri, 08 Jul 2016 05:26:19 +0000 Cc: Steve Longerbeam , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Adds ipu_ic_set_src() which is just aa wrapper around ipu_set_ic_src_mux(). Signed-off-by: Steve Longerbeam --- drivers/gpu/ipu-v3/ipu-ic.c | 10 ++++++++++ include/video/imx-ipu-v3.h | 1 + 2 files changed, 11 insertions(+) diff --git a/drivers/gpu/ipu-v3/ipu-ic.c b/drivers/gpu/ipu-v3/ipu-ic.c index 1dcb96c..f306a9c 100644 --- a/drivers/gpu/ipu-v3/ipu-ic.c +++ b/drivers/gpu/ipu-v3/ipu-ic.c @@ -629,6 +629,16 @@ unlock: } EXPORT_SYMBOL_GPL(ipu_ic_task_idma_init); +int ipu_ic_set_src(struct ipu_ic *ic, int csi_id, bool vdi) +{ + struct ipu_ic_priv *priv = ic->priv; + + ipu_set_ic_src_mux(priv->ipu, csi_id, vdi); + + return 0; +} +EXPORT_SYMBOL_GPL(ipu_ic_set_src); + int ipu_ic_enable(struct ipu_ic *ic) { struct ipu_ic_priv *priv = ic->priv; diff --git a/include/video/imx-ipu-v3.h b/include/video/imx-ipu-v3.h index 57b487d..8f77ddb 100644 --- a/include/video/imx-ipu-v3.h +++ b/include/video/imx-ipu-v3.h @@ -334,6 +334,7 @@ void ipu_ic_task_disable(struct ipu_ic *ic); int ipu_ic_task_idma_init(struct ipu_ic *ic, struct ipuv3_channel *channel, u32 width, u32 height, int burst_size, enum ipu_rotate_mode rot); +int ipu_ic_set_src(struct ipu_ic *ic, int csi_id, bool vdi); int ipu_ic_enable(struct ipu_ic *ic); int ipu_ic_disable(struct ipu_ic *ic); struct ipu_ic *ipu_ic_get(struct ipu_soc *ipu, enum ipu_ic_task task);