Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-09 14:43:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

media: aspeed: Fix unstable timing detection

Browse Source 
Using stable-signal in resolution detection, and try detection again
if unstable.

VE_MODE_DETECT_EXTSRC_ADC: 1 if video source is from ADC output.
VE_MODE_DETECT_H_STABLE: 1 if horizontal signal detection is stable.
VE_MODE_DETECT_V_STABLE: 1 if vertical signal detection is stable.

Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
This commit is contained in:
Jammy Huang 2022-01-26 09:47:25 +08:00 committed by Hans Verkuil
parent d6f9a60f64
commit 22443acce8
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/media/platform/aspeed-video.c
View File

@ -155,9 +155,14 @@
#define VE_MODE_DETECT_STATUS 0x098
#define VE_MODE_DETECT_H_PERIOD GENMASK(11, 0)
#define VE_MODE_DETECT_EXTSRC_ADC BIT(12)
#define VE_MODE_DETECT_H_STABLE BIT(13)
#define VE_MODE_DETECT_V_STABLE BIT(14)
#define VE_MODE_DETECT_V_LINES GENMASK(27, 16)
#define VE_MODE_DETECT_STATUS_VSYNC BIT(28)
#define VE_MODE_DETECT_STATUS_HSYNC BIT(29)
#define VE_MODE_DETECT_VSYNC_RDY BIT(30)
#define VE_MODE_DETECT_HSYNC_RDY BIT(31)
#define VE_SYNC_STATUS 0x09c
#define VE_SYNC_STATUS_HSYNC GENMASK(11, 0)
@ -939,6 +944,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video)
bool invalid_resolution = true;
int rc;
int tries = 0;
u32 mds;
u32 src_lr_edge;
u32 src_tb_edge;
struct v4l2_bt_timings *det = &video->detected_timings;
@ -969,6 +975,13 @@ static void aspeed_video_get_resolution(struct aspeed_video *video)
return;
}
mds = aspeed_video_read(video, VE_MODE_DETECT_STATUS);
// try detection again if current signal isn't stable
if (!(mds & VE_MODE_DETECT_H_STABLE) ||
!(mds & VE_MODE_DETECT_V_STABLE) ||
(mds & VE_MODE_DETECT_EXTSRC_ADC))
continue;
aspeed_video_check_and_set_polarity(video);
aspeed_video_enable_mode_detect(video);