Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e63a257e authored by Hans Verkuil's avatar Hans Verkuil Committed by Greg Kroah-Hartman
Browse files

media: videodev2.h: V4L2_DV_BT_BLANKING_HEIGHT should check 'interlaced' 



[ Upstream commit 8da7f0976b9071b528c545008de9d10cc81883b1 ]

If it is a progressive (non-interlaced) format, then ignore the
interlaced timing values.

Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Fixes: 7f68127f ([media] videodev2.h: defines to calculate blanking and frame sizes)
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 15ded23d

include/uapi/linux/videodev2.h

+2 −1
Original line number Diff line number Diff line
@@ -1318,7 +1318,8 @@ struct v4l2_bt_timings { 
	((bt)->width + V4L2_DV_BT_BLANKING_WIDTH(bt))

#define V4L2_DV_BT_BLANKING_HEIGHT(bt) \

	((bt)->vfrontporch + (bt)->vsync + (bt)->vbackporch + \

	 (bt)->il_vfrontporch + (bt)->il_vsync + (bt)->il_vbackporch)

	 ((bt)->interlaced ? \

	  ((bt)->il_vfrontporch + (bt)->il_vsync + (bt)->il_vbackporch) : 0))

#define V4L2_DV_BT_FRAME_HEIGHT(bt) \

	((bt)->height + V4L2_DV_BT_BLANKING_HEIGHT(bt))