From patchwork Tue Jun 14 22:49:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Longerbeam X-Patchwork-Id: 9177153 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 ECB326021C for ; Tue, 14 Jun 2016 22:53:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DD9EF28307 for ; Tue, 14 Jun 2016 22:53:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D287F2833B; Tue, 14 Jun 2016 22:53:45 +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.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham 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 13B1728338 for ; Tue, 14 Jun 2016 22:53:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752856AbcFNWxk (ORCPT ); Tue, 14 Jun 2016 18:53:40 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:35594 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752874AbcFNWvL (ORCPT ); Tue, 14 Jun 2016 18:51:11 -0400 Received: by mail-pf0-f194.google.com with SMTP id t190so301665pfb.2 for ; Tue, 14 Jun 2016 15:51:11 -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=yGEa22zTyriBY8E0AMdDYmu/D0nq2s1u+MG0WwN9kEC3KakPwPIi2HTV9ogvHS/kPc 4KzSjK5y+kbY9tIFBvaHELE/wGC8VoSKmctlkzERmpka2d2WUHYWzF6RfmCQ28ij1ZJN Z9buzjj2QveyCKRQEAUYm7+9gYa+dVT98hitjkNdzL0bzTgNTfPt0z8oqXIuH3wR4XsO oZeLj6eiERZHL1w+v2aB99Y+Le+gYUS6A3uaL9YKC99pojA2wjgLqYuUV7F6zbt5Jl94 +Gnz+/4C5dOGFeSiEwJzSF8y+8lw4qezeNl8KC3YHa5j1hEnzZ7rMgEhdPmA01VZTATE mW5A== 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=bJcV6pYy/JZb6ztgmyWRtQibRDm7WAMW2iKuOCIofrM3s7Fc3uI01duc6rxZBn1Jcs v7mJjf99aQLHs7xMZukRYYSlpfZTs3TYi3GiCbyxXkaWyy5kQRfAPg8d9O3hxVOGAAmg U3WbTuHIdA6JSC70t03lZZDT0xpeOP1vWQKwjg9/7MQC6k3iP77a+Bqmw/azeXab6ULs 8IjcVl4MCBwGFCkd3H8EConW95fKAWxoFG+7XBwWVxo+G+M6AMDn6OjOc0fv4Kj/ioAB CReUp2JPhtF+5NI2YSoXYfrTu8Jgv83Ncyws1+WuY56RKyEFJuu3wTPMGGVMDwrstpYT rvoA== X-Gm-Message-State: ALyK8tKAVQcwsykewcgCa+/fVHPngBMj4vOJiQ9ABeNVnhNyPkZo2azPybSlrGtFXoLCtg== X-Received: by 10.66.78.104 with SMTP id a8mr81641pax.88.1465944670767; Tue, 14 Jun 2016 15:51:10 -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 v184sm47829999pfb.24.2016.06.14.15.51.10 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 14 Jun 2016 15:51:10 -0700 (PDT) From: Steve Longerbeam X-Google-Original-From: Steve Longerbeam To: linux-media@vger.kernel.org Cc: Steve Longerbeam Subject: [PATCH 09/38] gpu: ipu-v3: Add ipu_ic_set_src() Date: Tue, 14 Jun 2016 15:49:05 -0700 Message-Id: <1465944574-15745-10-git-send-email-steve_longerbeam@mentor.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1465944574-15745-1-git-send-email-steve_longerbeam@mentor.com> References: <1465944574-15745-1-git-send-email-steve_longerbeam@mentor.com> 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 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);