diff options
| author | Jason Chen <b02280@freescale.com> | 2011-08-22 11:42:25 +0800 |
|---|---|---|
| committer | Pedro Perez de Heredia <pedro.perez@digi.com> | 2011-12-21 13:46:49 +0100 |
| commit | 3a26e29805f03c6f67457127937a89fa56fe20e3 (patch) | |
| tree | f9e9e8b58a75d8c15e484a9d914684e364129ab2 /drivers | |
| parent | 3e0330ec0d6aad83022e3af793fdf8f302f377ad (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>
Diffstat (limited to 'drivers')
| -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 892e8b64fd71..fd0ba2d0ee19 100644 --- a/drivers/mxc/ipu3/ipu_common.c +++ b/drivers/mxc/ipu3/ipu_common.c @@ -2057,6 +2057,7 @@ int32_t ipu_disable_channel(ipu_channel_t channel, bool wait_for_stop) 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_lock, lock_flags); @@ -2088,8 +2089,10 @@ int32_t ipu_disable_channel(ipu_channel_t channel, bool wait_for_stop) 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(channel, &fg_pos_x, &fg_pos_y); ipu_disp_set_window_pos(channel, 0, 0); + } _ipu_dp_dc_disable(channel, false); @@ -2221,6 +2224,9 @@ int32_t ipu_disable_channel(ipu_channel_t channel, bool wait_for_stop) spin_unlock_irqrestore(&ipu_lock, lock_flags); + if (channel == MEM_FG_SYNC) + ipu_disp_set_window_pos(channel, fg_pos_x, fg_pos_y); + return 0; } EXPORT_SYMBOL(ipu_disable_channel); |