diff options
| author | Liu Ying <b17645@freescale.com> | 2010-05-05 16:51:40 -0400 |
|---|---|---|
| committer | Liu Ying <b17645@freescale.com> | 2010-05-05 16:51:40 -0400 |
| commit | 9238e7fa94c664b3a673f53518b0b58190acc5a9 (patch) | |
| tree | ef4244e48f7e6ad1112a65f36a691da21a79f3b4 /drivers/mxc/ipu3 | |
| parent | 809c7346342d66ee006b6c951aa4319214844500 (diff) | |
ENGR00123129 IPUv3:Enable DMFC watermark
Enable IDMAC WM enable bit when enable corresponding
DMFC channel's watermark.
Signed-off-by: Liu Ying <b17645@freescale.com>
Diffstat (limited to 'drivers/mxc/ipu3')
| -rw-r--r-- | drivers/mxc/ipu3/ipu_common.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/mxc/ipu3/ipu_common.c b/drivers/mxc/ipu3/ipu_common.c index 8216b10ecf07..f7c803dd298b 100644 --- a/drivers/mxc/ipu3/ipu_common.c +++ b/drivers/mxc/ipu3/ipu_common.c @@ -1710,8 +1710,12 @@ int32_t ipu_enable_channel(ipu_channel_t channel) } if ((channel == MEM_DC_SYNC) || (channel == MEM_BG_SYNC) || - (channel == MEM_FG_SYNC)) + (channel == MEM_FG_SYNC)) { + reg = __raw_readl(IDMAC_WM_EN(in_dma)); + __raw_writel(reg | idma_mask(in_dma), IDMAC_WM_EN(in_dma)); + _ipu_dp_dc_enable(channel); + } if (_ipu_is_ic_chan(in_dma) || _ipu_is_ic_chan(out_dma) || _ipu_is_irt_chan(in_dma) || _ipu_is_irt_chan(out_dma)) @@ -1861,6 +1865,12 @@ int32_t ipu_disable_channel(ipu_channel_t channel, bool wait_for_stop) spin_lock_irqsave(&ipu_lock, lock_flags); + if ((channel == MEM_BG_SYNC) || (channel == MEM_FG_SYNC) || + (channel == MEM_DC_SYNC)) { + reg = __raw_readl(IDMAC_WM_EN(in_dma)); + __raw_writel(reg & ~idma_mask(in_dma), IDMAC_WM_EN(in_dma)); + } + /* Disable IC task */ if (_ipu_is_ic_chan(in_dma) || _ipu_is_ic_chan(out_dma) || _ipu_is_irt_chan(in_dma) || _ipu_is_irt_chan(out_dma)) |