diff options
| author | Jason Chen <b02280@freescale.com> | 2011-08-22 11:42:25 +0800 |
|---|---|---|
| committer | Jason Chen <b02280@freescale.com> | 2011-08-29 11:23:02 +0800 |
| commit | 31fb9293b59ed60adf69af2a43c2288b5339a557 (patch) | |
| tree | 12e4e052de5b90d657fe6003b3cef0d4d0e9ff5a | |
| parent | 1b2795628f06f35a79d71aa36a29e667e891278d (diff) | |
ENGR00155145 ipuv3 disp pos: restore pos setting after channel disable.
FG pos need be reset to 0 when channel disable, but it will lost old setting.
Signed-off-by: Jason Chen <b02280@freescale.com>
| -rw-r--r-- | drivers/mxc/ipu3/ipu_common.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/mxc/ipu3/ipu_common.c b/drivers/mxc/ipu3/ipu_common.c index 32fb0cc8a097..d3dccdc2e0dd 100644 --- a/drivers/mxc/ipu3/ipu_common.c +++ b/drivers/mxc/ipu3/ipu_common.c @@ -2192,6 +2192,7 @@ int32_t ipu_disable_channel(struct ipu_soc *ipu, ipu_channel_t channel, bool wai uint32_t out_dma; uint32_t sec_dma = NO_DMA; uint32_t thrd_dma = NO_DMA; + uint16_t fg_pos_x, fg_pos_y; spin_lock_irqsave(&ipu->ipu_lock, lock_flags); @@ -2223,8 +2224,10 @@ int32_t ipu_disable_channel(struct ipu_soc *ipu, ipu_channel_t channel, bool wai if ((channel == MEM_BG_SYNC) || (channel == MEM_FG_SYNC) || (channel == MEM_DC_SYNC)) { - if (channel == MEM_FG_SYNC) + if (channel == MEM_FG_SYNC) { + ipu_disp_get_window_pos(ipu, channel, &fg_pos_x, &fg_pos_y); ipu_disp_set_window_pos(ipu, channel, 0, 0); + } _ipu_dp_dc_disable(ipu, channel, false); @@ -2358,6 +2361,9 @@ int32_t ipu_disable_channel(struct ipu_soc *ipu, ipu_channel_t channel, bool wai ipu_clear_buffer_ready(ipu, channel, IPU_ALPHA_IN_BUFFER, 1); } + if (channel == MEM_FG_SYNC) + ipu_disp_set_window_pos(ipu, channel, fg_pos_x, fg_pos_y); + return 0; } EXPORT_SYMBOL(ipu_disable_channel); |