renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-26 14:14:01 +08:00
Code

[media] omap3isp: preview: Fix the crop margins

Browse Source 
Commit 3fdfedaaa "[media] omap3isp: preview: Lower the crop margins"
accidentally changed the previewer's cropping, causing the previewer
to miss four pixels on each line, thus corrupting the final image.
Restored the removed setting.

Cc: stable@vger.kernel.org
Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Florian Vaussard 2014-01-17 16:37:38 -03:00 committed by Mauro Carvalho Chehab
parent efab6b6a6e
commit 8b57b9669a
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/media/platform/omap3isp/isppreview.c
View File

@ -1079,6 +1079,7 @@ static void preview_config_input_format(struct isp_prev_device *prev,
*/ */
static void preview_config_input_size(struct isp_prev_device *prev, u32 active) static void preview_config_input_size(struct isp_prev_device *prev, u32 active)
{ {
const struct v4l2_mbus_framefmt *format = &prev->formats[PREV_PAD_SINK];
struct isp_device *isp = to_isp_device(prev); struct isp_device *isp = to_isp_device(prev);
unsigned int sph = prev->crop.left; unsigned int sph = prev->crop.left;
unsigned int eph = prev->crop.left + prev->crop.width - 1; unsigned int eph = prev->crop.left + prev->crop.width - 1;
@ -1086,6 +1087,14 @@ static void preview_config_input_size(struct isp_prev_device *prev, u32 active)
unsigned int elv = prev->crop.top + prev->crop.height - 1; unsigned int elv = prev->crop.top + prev->crop.height - 1;
u32 features; u32 features;
if (format->code != V4L2_MBUS_FMT_Y8_1X8 &&
format->code != V4L2_MBUS_FMT_Y10_1X10) {
sph -= 2;
eph += 2;
slv -= 2;
elv += 2;
}
features = (prev->params.params[0].features & active) features = (prev->params.params[0].features & active)
| (prev->params.params[1].features & ~active); | (prev->params.params[1].features & ~active);