Commit 5264edf1 authored by Dave Stevenson's avatar Dave Stevenson Committed by sanglipeng
Browse files

media: i2c: ov2680: Set V4L2_CTRL_FLAG_MODIFY_LAYOUT on flips 

stable inclusion
from stable-v5.10.195
commit e1552a0b990ba0a700c827a1c8c66ad5769618b4
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I95JOC

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=e1552a0b990ba0a700c827a1c8c66ad5769618b4



--------------------------------

[ Upstream commit 66274280 ]

The driver changes the Bayer order based on the flips, but
does not define the control correctly with the
V4L2_CTRL_FLAG_MODIFY_LAYOUT flag.

Add the V4L2_CTRL_FLAG_MODIFY_LAYOUT flag.

Signed-off-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.com>
Acked-by: default avatarRui Miguel Silva <rmfrfs@gmail.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
Stable-dep-of: 7b5a42e6 ("media: ov2680: Remove auto-gain and auto-exposure controls")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent 1b065c18

drivers/media/i2c/ov2680.c

+2 −0
Original line number Diff line number Diff line
@@ -966,6 +966,8 @@ static int ov2680_v4l2_register(struct ov2680_dev *sensor) 


	ctrls->gain->flags |= V4L2_CTRL_FLAG_VOLATILE;

	ctrls->exposure->flags |= V4L2_CTRL_FLAG_VOLATILE;

	ctrls->vflip->flags |= V4L2_CTRL_FLAG_MODIFY_LAYOUT;

	ctrls->hflip->flags |= V4L2_CTRL_FLAG_MODIFY_LAYOUT;



	v4l2_ctrl_auto_cluster(2, &ctrls->auto_gain, 0, true);

	v4l2_ctrl_auto_cluster(2, &ctrls->auto_exp, 1, true);