diff options
author | Steve Longerbeam <slongerbeam@gmail.com> | 2014-06-25 21:05:50 -0400 |
---|---|---|
committer | Philipp Zabel <p.zabel@pengutronix.de> | 2014-09-02 08:55:53 -0400 |
commit | 555f0e6690a41245518003c02a1ecb84e4a69281 (patch) | |
tree | 53ae6d8e7268f0f8d6cdf3b7d376039d3bd49805 | |
parent | 9b9da0be37490c77e92a2101a8c5d469ce1102f4 (diff) |
gpu: ipu-cpmem: Add ipu_cpmem_set_axi_id()
Adds ipu_cpmem_set_axi_id() to set which AXI bus master the channel
will use to transfer data onto AXI bus.
Signed-off-by: Steve Longerbeam <steve_longerbeam@mentor.com>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
-rw-r--r-- | drivers/gpu/ipu-v3/ipu-cpmem.c | 7 | ||||
-rw-r--r-- | include/video/imx-ipu-v3.h | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/ipu-v3/ipu-cpmem.c b/drivers/gpu/ipu-v3/ipu-cpmem.c index 28adf39e4041..2d1b3761f14c 100644 --- a/drivers/gpu/ipu-v3/ipu-cpmem.c +++ b/drivers/gpu/ipu-v3/ipu-cpmem.c | |||
@@ -254,6 +254,13 @@ void ipu_cpmem_interlaced_scan(struct ipuv3_channel *ch, int stride) | |||
254 | }; | 254 | }; |
255 | EXPORT_SYMBOL_GPL(ipu_cpmem_interlaced_scan); | 255 | EXPORT_SYMBOL_GPL(ipu_cpmem_interlaced_scan); |
256 | 256 | ||
257 | void ipu_cpmem_set_axi_id(struct ipuv3_channel *ch, u32 id) | ||
258 | { | ||
259 | id &= 0x3; | ||
260 | ipu_ch_param_write_field(ch, IPU_FIELD_ID, id); | ||
261 | } | ||
262 | EXPORT_SYMBOL_GPL(ipu_cpmem_set_axi_id); | ||
263 | |||
257 | void ipu_cpmem_set_burstsize(struct ipuv3_channel *ch, int burstsize) | 264 | void ipu_cpmem_set_burstsize(struct ipuv3_channel *ch, int burstsize) |
258 | { | 265 | { |
259 | ipu_ch_param_write_field(ch, IPU_FIELD_NPB, burstsize - 1); | 266 | ipu_ch_param_write_field(ch, IPU_FIELD_NPB, burstsize - 1); |
diff --git a/include/video/imx-ipu-v3.h b/include/video/imx-ipu-v3.h index d2cc207985d8..f30c06871db7 100644 --- a/include/video/imx-ipu-v3.h +++ b/include/video/imx-ipu-v3.h | |||
@@ -194,6 +194,7 @@ void ipu_cpmem_set_stride(struct ipuv3_channel *ch, int stride); | |||
194 | void ipu_cpmem_set_high_priority(struct ipuv3_channel *ch); | 194 | void ipu_cpmem_set_high_priority(struct ipuv3_channel *ch); |
195 | void ipu_cpmem_set_buffer(struct ipuv3_channel *ch, int bufnum, dma_addr_t buf); | 195 | void ipu_cpmem_set_buffer(struct ipuv3_channel *ch, int bufnum, dma_addr_t buf); |
196 | void ipu_cpmem_interlaced_scan(struct ipuv3_channel *ch, int stride); | 196 | void ipu_cpmem_interlaced_scan(struct ipuv3_channel *ch, int stride); |
197 | void ipu_cpmem_set_axi_id(struct ipuv3_channel *ch, u32 id); | ||
197 | void ipu_cpmem_set_burstsize(struct ipuv3_channel *ch, int burstsize); | 198 | void ipu_cpmem_set_burstsize(struct ipuv3_channel *ch, int burstsize); |
198 | void ipu_cpmem_set_block_mode(struct ipuv3_channel *ch); | 199 | void ipu_cpmem_set_block_mode(struct ipuv3_channel *ch); |
199 | int ipu_cpmem_set_format_rgb(struct ipuv3_channel *ch, | 200 | int ipu_cpmem_set_format_rgb(struct ipuv3_channel *ch, |