tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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: d2b4387f3bdf ("media: platform: Add Aspeed Video Engine driver")
Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com>
Reviewed-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

authored by

Jammy Huang and committed by
Mauro Carvalho Chehab 4b732a00 71ef8053

+6 -3
+6 -3
drivers/media/platform/aspeed-video.c
··· 154 154 #define VE_SRC_TB_EDGE_DET_BOT GENMASK(28, VE_SRC_TB_EDGE_DET_BOT_SHF) 155 155 156 156 #define VE_MODE_DETECT_STATUS 0x098 157 - #define VE_MODE_DETECT_H_PIXELS GENMASK(11, 0) 157 + #define VE_MODE_DETECT_H_PERIOD GENMASK(11, 0) 158 158 #define VE_MODE_DETECT_V_LINES_SHF 16 159 159 #define VE_MODE_DETECT_V_LINES GENMASK(27, VE_MODE_DETECT_V_LINES_SHF) 160 160 #define VE_MODE_DETECT_STATUS_VSYNC BIT(28) ··· 164 164 #define VE_SYNC_STATUS_HSYNC GENMASK(11, 0) 165 165 #define VE_SYNC_STATUS_VSYNC_SHF 16 166 166 #define VE_SYNC_STATUS_VSYNC GENMASK(27, VE_SYNC_STATUS_VSYNC_SHF) 167 + 168 + #define VE_H_TOTAL_PIXELS 0x0A0 167 169 168 170 #define VE_INTERRUPT_CTRL 0x304 169 171 #define VE_INTERRUPT_STATUS 0x308 ··· 818 816 u32 src_lr_edge; 819 817 u32 src_tb_edge; 820 818 u32 sync; 819 + u32 htotal; 821 820 struct v4l2_bt_timings *det = &video->detected_timings; 822 821 823 822 det->width = MIN_WIDTH; ··· 864 861 src_tb_edge = aspeed_video_read(video, VE_SRC_TB_EDGE_DET); 865 862 mds = aspeed_video_read(video, VE_MODE_DETECT_STATUS); 866 863 sync = aspeed_video_read(video, VE_SYNC_STATUS); 864 + htotal = aspeed_video_read(video, VE_H_TOTAL_PIXELS); 867 865 868 866 video->frame_bottom = (src_tb_edge & VE_SRC_TB_EDGE_DET_BOT) >> 869 867 VE_SRC_TB_EDGE_DET_BOT_SHF; ··· 881 877 VE_SRC_LR_EDGE_DET_RT_SHF; 882 878 video->frame_left = src_lr_edge & VE_SRC_LR_EDGE_DET_LEFT; 883 879 det->hfrontporch = video->frame_left; 884 - det->hbackporch = (mds & VE_MODE_DETECT_H_PIXELS) - 885 - video->frame_right; 880 + det->hbackporch = htotal - video->frame_right; 886 881 det->hsync = sync & VE_SYNC_STATUS_HSYNC; 887 882 if (video->frame_left > video->frame_right) 888 883 continue;