Commit 4b732a00 authored by Jammy Huang's avatar Jammy Huang Committed by Mauro Carvalho Chehab

media: aspeed: Correct value for h-total-pixels

Previous reg-field, 0x98[11:0], stands for the period of the detected
hsync signal.
Use the correct reg, 0xa0, to get h-total in pixels.

Fixes: d2b4387f ("media: platform: Add Aspeed Video Engine driver")
Signed-off-by: default avatarJammy Huang <jammy_huang@aspeedtech.com>
Reviewed-by: default avatarJoel Stanley <joel@jms.id.au>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 71ef8053
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
#define VE_SRC_TB_EDGE_DET_BOT GENMASK(28, VE_SRC_TB_EDGE_DET_BOT_SHF) #define VE_SRC_TB_EDGE_DET_BOT GENMASK(28, VE_SRC_TB_EDGE_DET_BOT_SHF)
#define VE_MODE_DETECT_STATUS 0x098 #define VE_MODE_DETECT_STATUS 0x098
#define VE_MODE_DETECT_H_PIXELS GENMASK(11, 0) #define VE_MODE_DETECT_H_PERIOD GENMASK(11, 0)
#define VE_MODE_DETECT_V_LINES_SHF 16 #define VE_MODE_DETECT_V_LINES_SHF 16
#define VE_MODE_DETECT_V_LINES GENMASK(27, VE_MODE_DETECT_V_LINES_SHF) #define VE_MODE_DETECT_V_LINES GENMASK(27, VE_MODE_DETECT_V_LINES_SHF)
#define VE_MODE_DETECT_STATUS_VSYNC BIT(28) #define VE_MODE_DETECT_STATUS_VSYNC BIT(28)
...@@ -165,6 +165,8 @@ ...@@ -165,6 +165,8 @@
#define VE_SYNC_STATUS_VSYNC_SHF 16 #define VE_SYNC_STATUS_VSYNC_SHF 16
#define VE_SYNC_STATUS_VSYNC GENMASK(27, VE_SYNC_STATUS_VSYNC_SHF) #define VE_SYNC_STATUS_VSYNC GENMASK(27, VE_SYNC_STATUS_VSYNC_SHF)
#define VE_H_TOTAL_PIXELS 0x0A0
#define VE_INTERRUPT_CTRL 0x304 #define VE_INTERRUPT_CTRL 0x304
#define VE_INTERRUPT_STATUS 0x308 #define VE_INTERRUPT_STATUS 0x308
#define VE_INTERRUPT_MODE_DETECT_WD BIT(0) #define VE_INTERRUPT_MODE_DETECT_WD BIT(0)
...@@ -816,6 +818,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) ...@@ -816,6 +818,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video)
u32 src_lr_edge; u32 src_lr_edge;
u32 src_tb_edge; u32 src_tb_edge;
u32 sync; u32 sync;
u32 htotal;
struct v4l2_bt_timings *det = &video->detected_timings; struct v4l2_bt_timings *det = &video->detected_timings;
det->width = MIN_WIDTH; det->width = MIN_WIDTH;
...@@ -861,6 +864,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) ...@@ -861,6 +864,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video)
src_tb_edge = aspeed_video_read(video, VE_SRC_TB_EDGE_DET); src_tb_edge = aspeed_video_read(video, VE_SRC_TB_EDGE_DET);
mds = aspeed_video_read(video, VE_MODE_DETECT_STATUS); mds = aspeed_video_read(video, VE_MODE_DETECT_STATUS);
sync = aspeed_video_read(video, VE_SYNC_STATUS); sync = aspeed_video_read(video, VE_SYNC_STATUS);
htotal = aspeed_video_read(video, VE_H_TOTAL_PIXELS);
video->frame_bottom = (src_tb_edge & VE_SRC_TB_EDGE_DET_BOT) >> video->frame_bottom = (src_tb_edge & VE_SRC_TB_EDGE_DET_BOT) >>
VE_SRC_TB_EDGE_DET_BOT_SHF; VE_SRC_TB_EDGE_DET_BOT_SHF;
...@@ -877,8 +881,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) ...@@ -877,8 +881,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video)
VE_SRC_LR_EDGE_DET_RT_SHF; VE_SRC_LR_EDGE_DET_RT_SHF;
video->frame_left = src_lr_edge & VE_SRC_LR_EDGE_DET_LEFT; video->frame_left = src_lr_edge & VE_SRC_LR_EDGE_DET_LEFT;
det->hfrontporch = video->frame_left; det->hfrontporch = video->frame_left;
det->hbackporch = (mds & VE_MODE_DETECT_H_PIXELS) - det->hbackporch = htotal - video->frame_right;
video->frame_right;
det->hsync = sync & VE_SYNC_STATUS_HSYNC; det->hsync = sync & VE_SYNC_STATUS_HSYNC;
if (video->frame_left > video->frame_right) if (video->frame_left > video->frame_right)
continue; continue;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment