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 05/16] gpu: ipu-v3: Add IDMA channel linking support
Date: Thu, 7 Jul 2016 16:03:30 -0700 [thread overview]
Message-ID: <1467932621-358-6-git-send-email-steve_longerbeam@mentor.com> (raw)
In-Reply-To: <1467932621-358-1-git-send-email-steve_longerbeam@mentor.com>
Adds functions to link and unlink IDMAC source channels to sink
channels.
So far the following links are supported:
IPUV3_CHANNEL_IC_PRP_ENC_MEM -> IPUV3_CHANNEL_MEM_ROT_ENC
PUV3_CHANNEL_IC_PRP_VF_MEM -> IPUV3_CHANNEL_MEM_ROT_VF
IPUV3_CHANNEL_IC_PP_MEM -> IPUV3_CHANNEL_MEM_ROT_PP
More links can be added to the idmac_link_info[] array.
Signed-off-by: Steve Longerbeam <steve_longerbeam@mentor.com>
---
drivers/gpu/ipu-v3/ipu-common.c | 112 ++++++++++++++++++++++++++++++++++++++++
include/video/imx-ipu-v3.h | 3 ++
2 files changed, 115 insertions(+)
diff --git a/drivers/gpu/ipu-v3/ipu-common.c b/drivers/gpu/ipu-v3/ipu-common.c
index 49af121..6d1676e 100644
--- a/drivers/gpu/ipu-v3/ipu-common.c
+++ b/drivers/gpu/ipu-v3/ipu-common.c
@@ -730,6 +730,118 @@ void ipu_set_ic_src_mux(struct ipu_soc *ipu, int csi_id, bool vdi)
}
EXPORT_SYMBOL_GPL(ipu_set_ic_src_mux);
+
+/* IDMAC Channel Linking */
+
+struct idmac_link_reg_info {
+ int chno;
+ u32 reg;
+ int shift;
+ int bits;
+ u32 sel;
+};
+
+struct idmac_link_info {
+ struct idmac_link_reg_info src;
+ struct idmac_link_reg_info sink;
+};
+
+static const struct idmac_link_info idmac_link_info[] = {
+ {
+ .src = { 20, IPU_FS_PROC_FLOW1, 0, 4, 7 },
+ .sink = { 45, IPU_FS_PROC_FLOW2, 0, 4, 1 },
+ }, {
+ .src = { 21, IPU_FS_PROC_FLOW1, 8, 4, 8 },
+ .sink = { 46, IPU_FS_PROC_FLOW2, 4, 4, 1 },
+ }, {
+ .src = { 22, IPU_FS_PROC_FLOW1, 16, 4, 5 },
+ .sink = { 47, IPU_FS_PROC_FLOW2, 12, 4, 3 },
+ },
+};
+
+static const struct idmac_link_info *find_idmac_link_info(
+ struct ipuv3_channel *src, struct ipuv3_channel *sink)
+{
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(idmac_link_info); i++) {
+ if (src->num == idmac_link_info[i].src.chno &&
+ sink->num == idmac_link_info[i].sink.chno)
+ return &idmac_link_info[i];
+ }
+
+ return NULL;
+}
+
+/*
+ * Links an IDMAC source channel to a sink channel.
+ */
+int ipu_idmac_link(struct ipuv3_channel *src, struct ipuv3_channel *sink)
+{
+ struct ipu_soc *ipu = src->ipu;
+ const struct idmac_link_info *link;
+ u32 src_reg, sink_reg, src_mask, sink_mask;
+ unsigned long flags;
+
+ link = find_idmac_link_info(src, sink);
+ if (!link)
+ return -EINVAL;
+
+ src_mask = ((1 << link->src.bits) - 1) << link->src.shift;
+ sink_mask = ((1 << link->sink.bits) - 1) << link->sink.shift;
+
+ spin_lock_irqsave(&ipu->lock, flags);
+
+ src_reg = ipu_cm_read(ipu, link->src.reg);
+ sink_reg = ipu_cm_read(ipu, link->sink.reg);
+
+ src_reg &= ~src_mask;
+ src_reg |= (link->src.sel << link->src.shift);
+
+ sink_reg &= ~sink_mask;
+ sink_reg |= (link->sink.sel << link->sink.shift);
+
+ ipu_cm_write(ipu, src_reg, link->src.reg);
+ ipu_cm_write(ipu, sink_reg, link->sink.reg);
+
+ spin_unlock_irqrestore(&ipu->lock, flags);
+ return 0;
+}
+EXPORT_SYMBOL_GPL(ipu_idmac_link);
+
+/*
+ * Unlinks IDMAC source and sink channels.
+ */
+int ipu_idmac_unlink(struct ipuv3_channel *src, struct ipuv3_channel *sink)
+{
+ struct ipu_soc *ipu = src->ipu;
+ const struct idmac_link_info *link;
+ u32 src_reg, sink_reg, src_mask, sink_mask;
+ unsigned long flags;
+
+ link = find_idmac_link_info(src, sink);
+ if (!link)
+ return -EINVAL;
+
+ src_mask = ((1 << link->src.bits) - 1) << link->src.shift;
+ sink_mask = ((1 << link->sink.bits) - 1) << link->sink.shift;
+
+ spin_lock_irqsave(&ipu->lock, flags);
+
+ src_reg = ipu_cm_read(ipu, link->src.reg);
+ sink_reg = ipu_cm_read(ipu, link->sink.reg);
+
+ src_reg &= ~src_mask;
+ sink_reg &= ~sink_mask;
+
+ ipu_cm_write(ipu, src_reg, link->src.reg);
+ ipu_cm_write(ipu, sink_reg, link->sink.reg);
+
+ spin_unlock_irqrestore(&ipu->lock, flags);
+ return 0;
+}
+EXPORT_SYMBOL_GPL(ipu_idmac_unlink);
+
struct ipu_devtype {
const char *name;
unsigned long cm_ofs;
diff --git a/include/video/imx-ipu-v3.h b/include/video/imx-ipu-v3.h
index b174f8a..0a39c64 100644
--- a/include/video/imx-ipu-v3.h
+++ b/include/video/imx-ipu-v3.h
@@ -128,6 +128,7 @@ enum ipu_channel_irq {
#define IPUV3_CHANNEL_ROT_VF_MEM 49
#define IPUV3_CHANNEL_ROT_PP_MEM 50
#define IPUV3_CHANNEL_MEM_BG_SYNC_ALPHA 51
+#define IPUV3_NUM_CHANNELS 64
int ipu_map_irq(struct ipu_soc *ipu, int irq);
int ipu_idmac_channel_irq(struct ipu_soc *ipu, struct ipuv3_channel *channel,
@@ -171,6 +172,8 @@ int ipu_idmac_get_current_buffer(struct ipuv3_channel *channel);
bool ipu_idmac_buffer_is_ready(struct ipuv3_channel *channel, u32 buf_num);
void ipu_idmac_select_buffer(struct ipuv3_channel *channel, u32 buf_num);
void ipu_idmac_clear_buffer(struct ipuv3_channel *channel, u32 buf_num);
+int ipu_idmac_link(struct ipuv3_channel *src, struct ipuv3_channel *sink);
+int ipu_idmac_unlink(struct ipuv3_channel *src, struct ipuv3_channel *sink);
/*
* IPU Channel Parameter Memory (cpmem) functions
--
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 ` Steve Longerbeam [this message]
2016-07-08 17:34 ` [PATCH 05/16] gpu: ipu-v3: Add IDMA channel linking support Philipp Zabel
2016-07-13 22:55 ` Steve Longerbeam
2016-07-07 23:03 ` [PATCH 06/16] gpu: ipu-v3: Add ipu_set_vdi_src_mux() Steve Longerbeam
2016-07-15 12:48 ` 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-6-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®