Commit bc22dbf2 authored by Hans Verkuil's avatar Hans Verkuil Committed by Lipeng Sang
Browse files

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

stable inclusion
from stable-v5.10.153
commit b6c7446d0a38725c64305bfb4728625d4f411f50
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I64YCA

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



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

[ Upstream commit 8da7f097 ]

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>
Signed-off-by: default avatarLipeng Sang <sanglipeng1@jd.com>
parent 081fb953

include/uapi/linux/videodev2.h

+2 −1
Original line number Diff line number Diff line
@@ -1552,7 +1552,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))