diff options
| author | Steve Longerbeam <slongerbeam@gmail.com> | 2014-06-25 18:05:50 -0700 |
|---|---|---|
| committer | Philipp Zabel <p.zabel@pengutronix.de> | 2014-09-02 14:55:53 +0200 |
| commit | 555f0e6690a41245518003c02a1ecb84e4a69281 (patch) | |
| tree | 53ae6d8e7268f0f8d6cdf3b7d376039d3bd49805 | |
| parent | 9b9da0be37490c77e92a2101a8c5d469ce1102f4 (diff) | |
| download | blackbird-op-linux-555f0e6690a41245518003c02a1ecb84e4a69281.tar.gz blackbird-op-linux-555f0e6690a41245518003c02a1ecb84e4a69281.zip | |
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) }; EXPORT_SYMBOL_GPL(ipu_cpmem_interlaced_scan); +void ipu_cpmem_set_axi_id(struct ipuv3_channel *ch, u32 id) +{ + id &= 0x3; + ipu_ch_param_write_field(ch, IPU_FIELD_ID, id); +} +EXPORT_SYMBOL_GPL(ipu_cpmem_set_axi_id); + void ipu_cpmem_set_burstsize(struct ipuv3_channel *ch, int burstsize) { 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); void ipu_cpmem_set_high_priority(struct ipuv3_channel *ch); void ipu_cpmem_set_buffer(struct ipuv3_channel *ch, int bufnum, dma_addr_t buf); void ipu_cpmem_interlaced_scan(struct ipuv3_channel *ch, int stride); +void ipu_cpmem_set_axi_id(struct ipuv3_channel *ch, u32 id); void ipu_cpmem_set_burstsize(struct ipuv3_channel *ch, int burstsize); void ipu_cpmem_set_block_mode(struct ipuv3_channel *ch); int ipu_cpmem_set_format_rgb(struct ipuv3_channel *ch, |
