diff options
| author | Mykola Ostrovskyy <mykola@ti.com> | 2012-05-08 16:36:06 +0300 |
|---|---|---|
| committer | Ziyann <jaraidaniel@gmail.com> | 2014-11-19 21:12:03 +0100 |
| commit | 3179c093b7704dc38636500203d7aa911c4571ef (patch) | |
| tree | 7272d83dcdbbcbb4a88c93afab47b8c7cd05cccd /drivers/video/omap2/dss/overlay.c | |
| parent | 66226089f146234543ca9cc4b506e51b12ce6e5b (diff) | |
| download | kernel_samsung_tuna-3179c093b7704dc38636500203d7aa911c4571ef.zip kernel_samsung_tuna-3179c093b7704dc38636500203d7aa911c4571ef.tar.gz kernel_samsung_tuna-3179c093b7704dc38636500203d7aa911c4571ef.tar.bz2 | |
OMAPDSS:DSS: Ignore display resolution for WB source overlay
When WB captures from an overlay in MEM2MEM mode, the captured
image may be up-scaled beyond the size of the display.
Change-Id: Idac2c5082fb60d68d996c15daf8a13080b1f068e
Signed-off-by: Mykola Ostrovskyy <mykola@ti.com>
Diffstat (limited to 'drivers/video/omap2/dss/overlay.c')
| -rw-r--r-- | drivers/video/omap2/dss/overlay.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/drivers/video/omap2/dss/overlay.c b/drivers/video/omap2/dss/overlay.c index adcfb1a..13d254c 100644 --- a/drivers/video/omap2/dss/overlay.c +++ b/drivers/video/omap2/dss/overlay.c @@ -588,16 +588,18 @@ int dss_check_overlay(struct omap_overlay *ovl, struct omap_dss_device *dssdev) outh = info->out_height; } - if (dw < info->pos_x + outw) { - DSSDBG("check_overlay failed 1: %d < %d + %d\n", - dw, info->pos_x, outw); - return -EINVAL; - } + if (!info->wb_source) { + if (dw < info->pos_x + outw) { + DSSDBG("check_overlay failed 1: %d < %d + %d\n", + dw, info->pos_x, outw); + return -EINVAL; + } - if (dh < info->pos_y + outh) { - DSSDBG("check_overlay failed 2: %d < %d + %d\n", - dh, info->pos_y, outh); - return -EINVAL; + if (dh < info->pos_y + outh) { + DSSDBG("check_overlay failed 2: %d < %d + %d\n", + dh, info->pos_y, outh); + return -EINVAL; + } } if ((ovl->supported_modes & info->color_mode) == 0) { |