From: Steve Longerbeam <slongerbeam@gmail.com>
To: p.zabel@pengutronix.de
Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
Steve Longerbeam <steve_longerbeam@mentor.com>
Subject: [PATCH 06/16] gpu: ipu-v3: Add ipu_set_vdi_src_mux()
Date: Thu, 7 Jul 2016 16:03:31 -0700 [thread overview]
Message-ID: <1467932621-358-7-git-send-email-steve_longerbeam@mentor.com> (raw)
In-Reply-To: <1467932621-358-1-git-send-email-steve_longerbeam@mentor.com>
Adds ipu_set_vdi_src_mux() that selects the VDIC input
(from CSI or memory).
Signed-off-by: Steve Longerbeam <steve_longerbeam@mentor.com>
---
drivers/gpu/ipu-v3/ipu-common.c | 20 ++++++++++++++++++++
include/video/imx-ipu-v3.h | 1 +
2 files changed, 21 insertions(+)
diff --git a/drivers/gpu/ipu-v3/ipu-common.c b/drivers/gpu/ipu-v3/ipu-common.c
index 6d1676e..374100e 100644
--- a/drivers/gpu/ipu-v3/ipu-common.c
+++ b/drivers/gpu/ipu-v3/ipu-common.c
@@ -730,6 +730,26 @@ void ipu_set_ic_src_mux(struct ipu_soc *ipu, int csi_id, bool vdi)
}
EXPORT_SYMBOL_GPL(ipu_set_ic_src_mux);
+/*
+ * Set the source for the VDIC. Selects either from CSI[01] or memory.
+ */
+void ipu_set_vdi_src_mux(struct ipu_soc *ipu, bool csi)
+{
+ unsigned long flags;
+ u32 val;
+
+ spin_lock_irqsave(&ipu->lock, flags);
+
+ val = ipu_cm_read(ipu, IPU_FS_PROC_FLOW1);
+ val &= ~(0x3 << 28);
+ if (csi)
+ val |= (0x01 << 28);
+ ipu_cm_write(ipu, val, IPU_FS_PROC_FLOW1);
+
+ spin_unlock_irqrestore(&ipu->lock, flags);
+}
+EXPORT_SYMBOL_GPL(ipu_set_vdi_src_mux);
+
/* IDMAC Channel Linking */
diff --git a/include/video/imx-ipu-v3.h b/include/video/imx-ipu-v3.h
index 0a39c64..586979e 100644
--- a/include/video/imx-ipu-v3.h
+++ b/include/video/imx-ipu-v3.h
@@ -152,6 +152,7 @@ int ipu_idmac_channel_irq(struct ipu_soc *ipu, struct ipuv3_channel *channel,
int ipu_get_num(struct ipu_soc *ipu);
void ipu_set_csi_src_mux(struct ipu_soc *ipu, int csi_id, bool mipi_csi2);
void ipu_set_ic_src_mux(struct ipu_soc *ipu, int csi_id, bool vdi);
+void ipu_set_vdi_src_mux(struct ipu_soc *ipu, bool csi);
void ipu_dump(struct ipu_soc *ipu);
/*
--
1.9.1
next prev parent reply other threads:[~2016-07-07 23:05 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-07 23:03 [PATCH 00/16] IPUv3 prep for i.MX5/6 v4l2 staging drivers Steve Longerbeam
2016-07-07 23:03 ` [PATCH 01/16] gpu: ipu-v3: Add Video Deinterlacer unit Steve Longerbeam
2016-07-11 0:02 ` Paul Gortmaker
2016-07-15 22:35 ` Steve Longerbeam
2016-07-07 23:03 ` [PATCH 02/16] gpu: ipu-cpmem: Add ipu_cpmem_set_uv_offset() Steve Longerbeam
2016-07-08 17:34 ` Philipp Zabel
2016-07-13 22:54 ` Steve Longerbeam
2016-07-15 12:45 ` Philipp Zabel
2016-07-07 23:03 ` [PATCH 03/16] gpu: ipu-cpmem: Add ipu_cpmem_get_burstsize() Steve Longerbeam
2016-07-07 23:03 ` [PATCH 04/16] gpu: ipu-v3: Add ipu_get_num() Steve Longerbeam
2016-07-15 12:45 ` Philipp Zabel
2016-07-07 23:03 ` [PATCH 05/16] gpu: ipu-v3: Add IDMA channel linking support Steve Longerbeam
2016-07-08 17:34 ` Philipp Zabel
2016-07-13 22:55 ` Steve Longerbeam
2016-07-07 23:03 ` Steve Longerbeam [this message]
2016-07-15 12:48 ` [PATCH 06/16] gpu: ipu-v3: Add ipu_set_vdi_src_mux() Philipp Zabel
2016-07-15 21:33 ` Steve Longerbeam
2016-07-07 23:03 ` [PATCH 07/16] gpu: ipu-v3: Add VDI input IDMAC channels Steve Longerbeam
2016-07-15 12:45 ` Philipp Zabel
2016-07-15 21:34 ` Steve Longerbeam
2016-07-07 23:03 ` [PATCH 08/16] gpu: ipu-v3: Add ipu_csi_set_src() Steve Longerbeam
2016-07-15 12:49 ` Philipp Zabel
2016-07-15 21:45 ` Steve Longerbeam
2016-07-07 23:03 ` [PATCH 09/16] gpu: ipu-v3: Add ipu_ic_set_src() Steve Longerbeam
2016-07-15 12:45 ` Philipp Zabel
2016-07-15 21:57 ` Steve Longerbeam
2016-07-07 23:03 ` [PATCH 10/16] gpu: ipu-v3: set correct full sensor frame for PAL/NTSC Steve Longerbeam
2016-07-07 23:03 ` [PATCH 11/16] gpu: ipu-v3: Fix CSI data format for 16-bit media bus formats Steve Longerbeam
2016-07-08 17:38 ` Philipp Zabel
2016-07-07 23:03 ` [PATCH 12/16] gpu: ipu-v3: Fix CSI0 blur in NTSC format Steve Longerbeam
2016-07-08 17:34 ` Philipp Zabel
2016-07-10 16:33 ` Steve Longerbeam
2016-07-13 23:02 ` Steve Longerbeam
2016-07-15 12:58 ` Philipp Zabel
2016-07-15 23:09 ` Steve Longerbeam
2016-07-16 20:24 ` Steve Longerbeam
2016-07-19 13:32 ` Philipp Zabel
2016-07-20 0:07 ` Steve Longerbeam
2016-07-07 23:03 ` [PATCH 13/16] gpu: ipu-v3: Fix IRT usage Steve Longerbeam
2016-07-07 23:03 ` [PATCH 14/16] gpu: ipu-ic: Add complete image conversion support with tiling Steve Longerbeam
2016-07-07 23:03 ` [PATCH 15/16] gpu: ipu-ic: allow multiple handles to ic Steve Longerbeam
2016-07-07 23:03 ` [PATCH 16/16] gpu: ipu-v3: rename CSI client device Steve Longerbeam
2016-07-08 17:34 ` [PATCH 00/16] IPUv3 prep for i.MX5/6 v4l2 staging drivers Philipp Zabel
2016-07-20 1:10 ` [PATCH v2 00/13] IPUv3 prep for i.MX5/6 v4l2 staging drivers, v2 Steve Longerbeam
2016-07-20 1:10 ` [PATCH v2 01/13] gpu: ipu-v3: Add Video Deinterlacer unit Steve Longerbeam
2016-07-25 6:06 ` kbuild test robot
2016-07-26 10:06 ` Philipp Zabel
2016-07-20 1:11 ` [PATCH v2 02/13] gpu: ipu-cpmem: Add ipu_cpmem_set_uv_offset() Steve Longerbeam
2016-07-20 1:11 ` [PATCH v2 03/13] gpu: ipu-cpmem: Add ipu_cpmem_get_burstsize() Steve Longerbeam
2016-07-20 1:11 ` [PATCH v2 04/13] gpu: ipu-v3: Add ipu_get_num() Steve Longerbeam
2016-07-20 1:11 ` [PATCH v2 05/13] gpu: ipu-v3: Add IDMA channel linking support Steve Longerbeam
2016-07-26 10:06 ` Philipp Zabel
2016-07-28 23:40 ` Steve Longerbeam
2016-07-20 1:11 ` [PATCH v2 06/13] gpu: ipu-v3: Add ipu_set_vdi_src_mux() Steve Longerbeam
2016-07-20 1:11 ` [PATCH v2 07/13] gpu: ipu-v3: Add VDI input IDMAC channels Steve Longerbeam
2016-07-20 1:11 ` [PATCH v2 08/13] gpu: ipu-v3: set correct full sensor frame for PAL/NTSC Steve Longerbeam
2016-07-20 1:11 ` [PATCH v2 09/13] gpu: ipu-v3: Fix CSI data format for 16-bit media bus formats Steve Longerbeam
2016-07-20 1:11 ` [PATCH v2 10/13] gpu: ipu-v3: Fix IRT usage Steve Longerbeam
2016-07-20 1:11 ` [PATCH v2 11/13] gpu: ipu-ic: Add complete image conversion support with tiling Steve Longerbeam
2016-07-26 10:08 ` Philipp Zabel
2016-07-28 23:09 ` Steve Longerbeam
2016-08-01 9:29 ` Philipp Zabel
2016-08-04 0:18 ` Steve Longerbeam
2016-08-12 14:56 ` Philipp Zabel
2016-07-20 1:11 ` [PATCH v2 12/13] gpu: ipu-ic: allow multiple handles to ic Steve Longerbeam
2016-07-20 1:11 ` [PATCH v2 13/13] gpu: ipu-v3: rename CSI client device Steve Longerbeam
2016-07-26 10:06 ` [PATCH v2 00/13] IPUv3 prep for i.MX5/6 v4l2 staging drivers, v2 Philipp Zabel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1467932621-358-7-git-send-email-steve_longerbeam@mentor.com \
--to=slongerbeam@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=p.zabel@pengutronix.de \
--cc=steve_longerbeam@mentor.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®