* [PATCH 0/4] Correct timing report @ 2021-12-17 9:53 ` Jammy Huang 0 siblings, 0 replies; 43+ messages in thread From: Jammy Huang @ 2021-12-17 9:53 UTC (permalink / raw) To: linux-aspeed This series will correct the value of timing detected. Jammy Huang (4): media: aspeed: Correct value for h-total-pixels media: aspeed: Use FIELD_GET to improve readability media: aspeed: Correct values for detected timing media: aspeed: Fix timing polarity incorrect drivers/media/platform/aspeed-video.c | 83 +++++++++++++++++++-------- 1 file changed, 59 insertions(+), 24 deletions(-) -- 2.25.1 ^ permalink raw reply [flat|nested] 43+ messages in thread
* [PATCH 0/4] Correct timing report @ 2021-12-17 9:53 ` Jammy Huang 0 siblings, 0 replies; 43+ messages in thread From: Jammy Huang @ 2021-12-17 9:53 UTC (permalink / raw) To: eajames, mchehab, joel, andrew, linux-media, openbmc, linux-arm-kernel, linux-aspeed, linux-kernel This series will correct the value of timing detected. Jammy Huang (4): media: aspeed: Correct value for h-total-pixels media: aspeed: Use FIELD_GET to improve readability media: aspeed: Correct values for detected timing media: aspeed: Fix timing polarity incorrect drivers/media/platform/aspeed-video.c | 83 +++++++++++++++++++-------- 1 file changed, 59 insertions(+), 24 deletions(-) -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 43+ messages in thread
* [PATCH 0/4] Correct timing report @ 2021-12-17 9:53 ` Jammy Huang 0 siblings, 0 replies; 43+ messages in thread From: Jammy Huang @ 2021-12-17 9:53 UTC (permalink / raw) To: eajames, mchehab, joel, andrew, linux-media, openbmc, linux-arm-kernel, linux-aspeed, linux-kernel This series will correct the value of timing detected. Jammy Huang (4): media: aspeed: Correct value for h-total-pixels media: aspeed: Use FIELD_GET to improve readability media: aspeed: Correct values for detected timing media: aspeed: Fix timing polarity incorrect drivers/media/platform/aspeed-video.c | 83 +++++++++++++++++++-------- 1 file changed, 59 insertions(+), 24 deletions(-) -- 2.25.1 ^ permalink raw reply [flat|nested] 43+ messages in thread
* [PATCH 1/4] media: aspeed: Correct value for h-total-pixels 2021-12-17 9:53 ` Jammy Huang (?) @ 2021-12-17 9:54 ` Jammy Huang -1 siblings, 0 replies; 43+ messages in thread From: Jammy Huang @ 2021-12-17 9:54 UTC (permalink / raw) To: linux-aspeed 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. Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> --- drivers/media/platform/aspeed-video.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c index b388bc56ce81..d5f77b205175 100644 --- a/drivers/media/platform/aspeed-video.c +++ b/drivers/media/platform/aspeed-video.c @@ -166,7 +166,7 @@ #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_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 GENMASK(27, VE_MODE_DETECT_V_LINES_SHF) #define VE_MODE_DETECT_STATUS_VSYNC BIT(28) @@ -177,6 +177,8 @@ #define VE_SYNC_STATUS_VSYNC_SHF 16 #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_STATUS 0x308 #define VE_INTERRUPT_MODE_DETECT_WD BIT(0) @@ -938,6 +940,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) u32 src_lr_edge; u32 src_tb_edge; u32 sync; + u32 htotal; struct v4l2_bt_timings *det = &video->detected_timings; det->width = MIN_WIDTH; @@ -983,6 +986,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) src_tb_edge = aspeed_video_read(video, VE_SRC_TB_EDGE_DET); mds = aspeed_video_read(video, VE_MODE_DETECT_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) >> VE_SRC_TB_EDGE_DET_BOT_SHF; @@ -999,8 +1003,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) VE_SRC_LR_EDGE_DET_RT_SHF; video->frame_left = src_lr_edge & VE_SRC_LR_EDGE_DET_LEFT; det->hfrontporch = video->frame_left; - det->hbackporch = (mds & VE_MODE_DETECT_H_PIXELS) - - video->frame_right; + det->hbackporch = htotal - video->frame_right; det->hsync = sync & VE_SYNC_STATUS_HSYNC; if (video->frame_left > video->frame_right) continue; -- 2.25.1 ^ permalink raw reply related [flat|nested] 43+ messages in thread
* [PATCH 1/4] media: aspeed: Correct value for h-total-pixels @ 2021-12-17 9:54 ` Jammy Huang 0 siblings, 0 replies; 43+ messages in thread From: Jammy Huang @ 2021-12-17 9:54 UTC (permalink / raw) To: eajames, mchehab, joel, andrew, linux-media, openbmc, linux-arm-kernel, linux-aspeed, linux-kernel 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. Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> --- drivers/media/platform/aspeed-video.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c index b388bc56ce81..d5f77b205175 100644 --- a/drivers/media/platform/aspeed-video.c +++ b/drivers/media/platform/aspeed-video.c @@ -166,7 +166,7 @@ #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_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 GENMASK(27, VE_MODE_DETECT_V_LINES_SHF) #define VE_MODE_DETECT_STATUS_VSYNC BIT(28) @@ -177,6 +177,8 @@ #define VE_SYNC_STATUS_VSYNC_SHF 16 #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_STATUS 0x308 #define VE_INTERRUPT_MODE_DETECT_WD BIT(0) @@ -938,6 +940,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) u32 src_lr_edge; u32 src_tb_edge; u32 sync; + u32 htotal; struct v4l2_bt_timings *det = &video->detected_timings; det->width = MIN_WIDTH; @@ -983,6 +986,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) src_tb_edge = aspeed_video_read(video, VE_SRC_TB_EDGE_DET); mds = aspeed_video_read(video, VE_MODE_DETECT_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) >> VE_SRC_TB_EDGE_DET_BOT_SHF; @@ -999,8 +1003,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) VE_SRC_LR_EDGE_DET_RT_SHF; video->frame_left = src_lr_edge & VE_SRC_LR_EDGE_DET_LEFT; det->hfrontporch = video->frame_left; - det->hbackporch = (mds & VE_MODE_DETECT_H_PIXELS) - - video->frame_right; + det->hbackporch = htotal - video->frame_right; det->hsync = sync & VE_SYNC_STATUS_HSYNC; if (video->frame_left > video->frame_right) continue; -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 43+ messages in thread
* [PATCH 1/4] media: aspeed: Correct value for h-total-pixels @ 2021-12-17 9:54 ` Jammy Huang 0 siblings, 0 replies; 43+ messages in thread From: Jammy Huang @ 2021-12-17 9:54 UTC (permalink / raw) To: eajames, mchehab, joel, andrew, linux-media, openbmc, linux-arm-kernel, linux-aspeed, linux-kernel 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. Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> --- drivers/media/platform/aspeed-video.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c index b388bc56ce81..d5f77b205175 100644 --- a/drivers/media/platform/aspeed-video.c +++ b/drivers/media/platform/aspeed-video.c @@ -166,7 +166,7 @@ #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_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 GENMASK(27, VE_MODE_DETECT_V_LINES_SHF) #define VE_MODE_DETECT_STATUS_VSYNC BIT(28) @@ -177,6 +177,8 @@ #define VE_SYNC_STATUS_VSYNC_SHF 16 #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_STATUS 0x308 #define VE_INTERRUPT_MODE_DETECT_WD BIT(0) @@ -938,6 +940,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) u32 src_lr_edge; u32 src_tb_edge; u32 sync; + u32 htotal; struct v4l2_bt_timings *det = &video->detected_timings; det->width = MIN_WIDTH; @@ -983,6 +986,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) src_tb_edge = aspeed_video_read(video, VE_SRC_TB_EDGE_DET); mds = aspeed_video_read(video, VE_MODE_DETECT_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) >> VE_SRC_TB_EDGE_DET_BOT_SHF; @@ -999,8 +1003,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) VE_SRC_LR_EDGE_DET_RT_SHF; video->frame_left = src_lr_edge & VE_SRC_LR_EDGE_DET_LEFT; det->hfrontporch = video->frame_left; - det->hbackporch = (mds & VE_MODE_DETECT_H_PIXELS) - - video->frame_right; + det->hbackporch = htotal - video->frame_right; det->hsync = sync & VE_SYNC_STATUS_HSYNC; if (video->frame_left > video->frame_right) continue; -- 2.25.1 ^ permalink raw reply related [flat|nested] 43+ messages in thread
* [PATCH 1/4] media: aspeed: Correct value for h-total-pixels 2021-12-17 9:54 ` Jammy Huang (?) (?) @ 2021-12-22 0:54 ` Joel Stanley -1 siblings, 0 replies; 43+ messages in thread From: Joel Stanley @ 2021-12-22 0:54 UTC (permalink / raw) To: linux-aspeed On Fri, 17 Dec 2021 at 09:54, Jammy Huang <jammy_huang@aspeedtech.com> wrote: > > 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. > > Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> Fixes: d2b4387f3bdf ("media: platform: Add Aspeed Video Engine driver") Reviewed-by: Joel Stanley <joel@jms.id.au> > --- > drivers/media/platform/aspeed-video.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c > index b388bc56ce81..d5f77b205175 100644 > --- a/drivers/media/platform/aspeed-video.c > +++ b/drivers/media/platform/aspeed-video.c > @@ -166,7 +166,7 @@ > #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_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 GENMASK(27, VE_MODE_DETECT_V_LINES_SHF) > #define VE_MODE_DETECT_STATUS_VSYNC BIT(28) > @@ -177,6 +177,8 @@ > #define VE_SYNC_STATUS_VSYNC_SHF 16 > #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_STATUS 0x308 > #define VE_INTERRUPT_MODE_DETECT_WD BIT(0) > @@ -938,6 +940,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) > u32 src_lr_edge; > u32 src_tb_edge; > u32 sync; > + u32 htotal; > struct v4l2_bt_timings *det = &video->detected_timings; > > det->width = MIN_WIDTH; > @@ -983,6 +986,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) > src_tb_edge = aspeed_video_read(video, VE_SRC_TB_EDGE_DET); > mds = aspeed_video_read(video, VE_MODE_DETECT_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) >> > VE_SRC_TB_EDGE_DET_BOT_SHF; > @@ -999,8 +1003,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) > VE_SRC_LR_EDGE_DET_RT_SHF; > video->frame_left = src_lr_edge & VE_SRC_LR_EDGE_DET_LEFT; > det->hfrontporch = video->frame_left; > - det->hbackporch = (mds & VE_MODE_DETECT_H_PIXELS) - > - video->frame_right; > + det->hbackporch = htotal - video->frame_right; > det->hsync = sync & VE_SYNC_STATUS_HSYNC; > if (video->frame_left > video->frame_right) > continue; > -- > 2.25.1 > ^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PATCH 1/4] media: aspeed: Correct value for h-total-pixels @ 2021-12-22 0:54 ` Joel Stanley 0 siblings, 0 replies; 43+ messages in thread From: Joel Stanley @ 2021-12-22 0:54 UTC (permalink / raw) To: Jammy Huang Cc: Eddie James, Mauro Carvalho Chehab, Andrew Jeffery, linux-media, OpenBMC Maillist, Linux ARM, linux-aspeed, Linux Kernel Mailing List On Fri, 17 Dec 2021 at 09:54, Jammy Huang <jammy_huang@aspeedtech.com> wrote: > > 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. > > Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> Fixes: d2b4387f3bdf ("media: platform: Add Aspeed Video Engine driver") Reviewed-by: Joel Stanley <joel@jms.id.au> > --- > drivers/media/platform/aspeed-video.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c > index b388bc56ce81..d5f77b205175 100644 > --- a/drivers/media/platform/aspeed-video.c > +++ b/drivers/media/platform/aspeed-video.c > @@ -166,7 +166,7 @@ > #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_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 GENMASK(27, VE_MODE_DETECT_V_LINES_SHF) > #define VE_MODE_DETECT_STATUS_VSYNC BIT(28) > @@ -177,6 +177,8 @@ > #define VE_SYNC_STATUS_VSYNC_SHF 16 > #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_STATUS 0x308 > #define VE_INTERRUPT_MODE_DETECT_WD BIT(0) > @@ -938,6 +940,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) > u32 src_lr_edge; > u32 src_tb_edge; > u32 sync; > + u32 htotal; > struct v4l2_bt_timings *det = &video->detected_timings; > > det->width = MIN_WIDTH; > @@ -983,6 +986,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) > src_tb_edge = aspeed_video_read(video, VE_SRC_TB_EDGE_DET); > mds = aspeed_video_read(video, VE_MODE_DETECT_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) >> > VE_SRC_TB_EDGE_DET_BOT_SHF; > @@ -999,8 +1003,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) > VE_SRC_LR_EDGE_DET_RT_SHF; > video->frame_left = src_lr_edge & VE_SRC_LR_EDGE_DET_LEFT; > det->hfrontporch = video->frame_left; > - det->hbackporch = (mds & VE_MODE_DETECT_H_PIXELS) - > - video->frame_right; > + det->hbackporch = htotal - video->frame_right; > det->hsync = sync & VE_SYNC_STATUS_HSYNC; > if (video->frame_left > video->frame_right) > continue; > -- > 2.25.1 > ^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PATCH 1/4] media: aspeed: Correct value for h-total-pixels @ 2021-12-22 0:54 ` Joel Stanley 0 siblings, 0 replies; 43+ messages in thread From: Joel Stanley @ 2021-12-22 0:54 UTC (permalink / raw) To: Jammy Huang Cc: Eddie James, Mauro Carvalho Chehab, Andrew Jeffery, linux-media, OpenBMC Maillist, Linux ARM, linux-aspeed, Linux Kernel Mailing List On Fri, 17 Dec 2021 at 09:54, Jammy Huang <jammy_huang@aspeedtech.com> wrote: > > 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. > > Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> Fixes: d2b4387f3bdf ("media: platform: Add Aspeed Video Engine driver") Reviewed-by: Joel Stanley <joel@jms.id.au> > --- > drivers/media/platform/aspeed-video.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c > index b388bc56ce81..d5f77b205175 100644 > --- a/drivers/media/platform/aspeed-video.c > +++ b/drivers/media/platform/aspeed-video.c > @@ -166,7 +166,7 @@ > #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_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 GENMASK(27, VE_MODE_DETECT_V_LINES_SHF) > #define VE_MODE_DETECT_STATUS_VSYNC BIT(28) > @@ -177,6 +177,8 @@ > #define VE_SYNC_STATUS_VSYNC_SHF 16 > #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_STATUS 0x308 > #define VE_INTERRUPT_MODE_DETECT_WD BIT(0) > @@ -938,6 +940,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) > u32 src_lr_edge; > u32 src_tb_edge; > u32 sync; > + u32 htotal; > struct v4l2_bt_timings *det = &video->detected_timings; > > det->width = MIN_WIDTH; > @@ -983,6 +986,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) > src_tb_edge = aspeed_video_read(video, VE_SRC_TB_EDGE_DET); > mds = aspeed_video_read(video, VE_MODE_DETECT_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) >> > VE_SRC_TB_EDGE_DET_BOT_SHF; > @@ -999,8 +1003,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) > VE_SRC_LR_EDGE_DET_RT_SHF; > video->frame_left = src_lr_edge & VE_SRC_LR_EDGE_DET_LEFT; > det->hfrontporch = video->frame_left; > - det->hbackporch = (mds & VE_MODE_DETECT_H_PIXELS) - > - video->frame_right; > + det->hbackporch = htotal - video->frame_right; > det->hsync = sync & VE_SYNC_STATUS_HSYNC; > if (video->frame_left > video->frame_right) > continue; > -- > 2.25.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PATCH 1/4] media: aspeed: Correct value for h-total-pixels @ 2021-12-22 0:54 ` Joel Stanley 0 siblings, 0 replies; 43+ messages in thread From: Joel Stanley @ 2021-12-22 0:54 UTC (permalink / raw) To: Jammy Huang Cc: linux-aspeed, Andrew Jeffery, OpenBMC Maillist, Eddie James, Linux Kernel Mailing List, Mauro Carvalho Chehab, Linux ARM, linux-media On Fri, 17 Dec 2021 at 09:54, Jammy Huang <jammy_huang@aspeedtech.com> wrote: > > 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. > > Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> Fixes: d2b4387f3bdf ("media: platform: Add Aspeed Video Engine driver") Reviewed-by: Joel Stanley <joel@jms.id.au> > --- > drivers/media/platform/aspeed-video.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c > index b388bc56ce81..d5f77b205175 100644 > --- a/drivers/media/platform/aspeed-video.c > +++ b/drivers/media/platform/aspeed-video.c > @@ -166,7 +166,7 @@ > #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_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 GENMASK(27, VE_MODE_DETECT_V_LINES_SHF) > #define VE_MODE_DETECT_STATUS_VSYNC BIT(28) > @@ -177,6 +177,8 @@ > #define VE_SYNC_STATUS_VSYNC_SHF 16 > #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_STATUS 0x308 > #define VE_INTERRUPT_MODE_DETECT_WD BIT(0) > @@ -938,6 +940,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) > u32 src_lr_edge; > u32 src_tb_edge; > u32 sync; > + u32 htotal; > struct v4l2_bt_timings *det = &video->detected_timings; > > det->width = MIN_WIDTH; > @@ -983,6 +986,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) > src_tb_edge = aspeed_video_read(video, VE_SRC_TB_EDGE_DET); > mds = aspeed_video_read(video, VE_MODE_DETECT_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) >> > VE_SRC_TB_EDGE_DET_BOT_SHF; > @@ -999,8 +1003,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) > VE_SRC_LR_EDGE_DET_RT_SHF; > video->frame_left = src_lr_edge & VE_SRC_LR_EDGE_DET_LEFT; > det->hfrontporch = video->frame_left; > - det->hbackporch = (mds & VE_MODE_DETECT_H_PIXELS) - > - video->frame_right; > + det->hbackporch = htotal - video->frame_right; > det->hsync = sync & VE_SYNC_STATUS_HSYNC; > if (video->frame_left > video->frame_right) > continue; > -- > 2.25.1 > ^ permalink raw reply [flat|nested] 43+ messages in thread
* [PATCH 2/4] media: aspeed: Use FIELD_GET to improve readability 2021-12-17 9:53 ` Jammy Huang (?) @ 2021-12-17 9:54 ` Jammy Huang -1 siblings, 0 replies; 43+ messages in thread From: Jammy Huang @ 2021-12-17 9:54 UTC (permalink / raw) To: linux-aspeed Use the bitfield macro FIELD_GET, and GENMASK to do the shift and mask in one go for reg values. Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> --- drivers/media/platform/aspeed-video.c | 35 ++++++++++++--------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c index d5f77b205175..581a4261f9b7 100644 --- a/drivers/media/platform/aspeed-video.c +++ b/drivers/media/platform/aspeed-video.c @@ -156,26 +156,22 @@ #define VE_SRC_LR_EDGE_DET_NO_H BIT(13) #define VE_SRC_LR_EDGE_DET_NO_DISP BIT(14) #define VE_SRC_LR_EDGE_DET_NO_CLK BIT(15) -#define VE_SRC_LR_EDGE_DET_RT_SHF 16 -#define VE_SRC_LR_EDGE_DET_RT GENMASK(27, VE_SRC_LR_EDGE_DET_RT_SHF) +#define VE_SRC_LR_EDGE_DET_RT GENMASK(27, 16) #define VE_SRC_LR_EDGE_DET_INTERLACE BIT(31) #define VE_SRC_TB_EDGE_DET 0x094 #define VE_SRC_TB_EDGE_DET_TOP GENMASK(12, 0) -#define VE_SRC_TB_EDGE_DET_BOT_SHF 16 -#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, 16) #define VE_MODE_DETECT_STATUS 0x098 #define VE_MODE_DETECT_H_PERIOD GENMASK(11, 0) -#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, 16) #define VE_MODE_DETECT_STATUS_VSYNC BIT(28) #define VE_MODE_DETECT_STATUS_HSYNC BIT(29) #define VE_SYNC_STATUS 0x09c #define VE_SYNC_STATUS_HSYNC GENMASK(11, 0) -#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, 16) #define VE_H_TOTAL_PIXELS 0x0A0 @@ -988,23 +984,24 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) 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) >> - VE_SRC_TB_EDGE_DET_BOT_SHF; - video->frame_top = src_tb_edge & VE_SRC_TB_EDGE_DET_TOP; + video->frame_bottom = FIELD_GET(VE_SRC_TB_EDGE_DET_BOT, + src_tb_edge); + video->frame_top = FIELD_GET(VE_SRC_TB_EDGE_DET_TOP, + src_tb_edge); det->vfrontporch = video->frame_top; - det->vbackporch = ((mds & VE_MODE_DETECT_V_LINES) >> - VE_MODE_DETECT_V_LINES_SHF) - video->frame_bottom; - det->vsync = (sync & VE_SYNC_STATUS_VSYNC) >> - VE_SYNC_STATUS_VSYNC_SHF; + det->vbackporch = FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - + video->frame_bottom; + det->vsync = FIELD_GET(VE_SYNC_STATUS_VSYNC, sync); if (video->frame_top > video->frame_bottom) continue; - video->frame_right = (src_lr_edge & VE_SRC_LR_EDGE_DET_RT) >> - VE_SRC_LR_EDGE_DET_RT_SHF; - video->frame_left = src_lr_edge & VE_SRC_LR_EDGE_DET_LEFT; + video->frame_right = FIELD_GET(VE_SRC_LR_EDGE_DET_RT, + src_lr_edge); + video->frame_left = FIELD_GET(VE_SRC_LR_EDGE_DET_LEFT, + src_lr_edge); det->hfrontporch = video->frame_left; det->hbackporch = htotal - video->frame_right; - det->hsync = sync & VE_SYNC_STATUS_HSYNC; + det->hsync = FIELD_GET(VE_SYNC_STATUS_HSYNC, sync); if (video->frame_left > video->frame_right) continue; -- 2.25.1 ^ permalink raw reply related [flat|nested] 43+ messages in thread
* [PATCH 2/4] media: aspeed: Use FIELD_GET to improve readability @ 2021-12-17 9:54 ` Jammy Huang 0 siblings, 0 replies; 43+ messages in thread From: Jammy Huang @ 2021-12-17 9:54 UTC (permalink / raw) To: eajames, mchehab, joel, andrew, linux-media, openbmc, linux-arm-kernel, linux-aspeed, linux-kernel Use the bitfield macro FIELD_GET, and GENMASK to do the shift and mask in one go for reg values. Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> --- drivers/media/platform/aspeed-video.c | 35 ++++++++++++--------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c index d5f77b205175..581a4261f9b7 100644 --- a/drivers/media/platform/aspeed-video.c +++ b/drivers/media/platform/aspeed-video.c @@ -156,26 +156,22 @@ #define VE_SRC_LR_EDGE_DET_NO_H BIT(13) #define VE_SRC_LR_EDGE_DET_NO_DISP BIT(14) #define VE_SRC_LR_EDGE_DET_NO_CLK BIT(15) -#define VE_SRC_LR_EDGE_DET_RT_SHF 16 -#define VE_SRC_LR_EDGE_DET_RT GENMASK(27, VE_SRC_LR_EDGE_DET_RT_SHF) +#define VE_SRC_LR_EDGE_DET_RT GENMASK(27, 16) #define VE_SRC_LR_EDGE_DET_INTERLACE BIT(31) #define VE_SRC_TB_EDGE_DET 0x094 #define VE_SRC_TB_EDGE_DET_TOP GENMASK(12, 0) -#define VE_SRC_TB_EDGE_DET_BOT_SHF 16 -#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, 16) #define VE_MODE_DETECT_STATUS 0x098 #define VE_MODE_DETECT_H_PERIOD GENMASK(11, 0) -#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, 16) #define VE_MODE_DETECT_STATUS_VSYNC BIT(28) #define VE_MODE_DETECT_STATUS_HSYNC BIT(29) #define VE_SYNC_STATUS 0x09c #define VE_SYNC_STATUS_HSYNC GENMASK(11, 0) -#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, 16) #define VE_H_TOTAL_PIXELS 0x0A0 @@ -988,23 +984,24 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) 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) >> - VE_SRC_TB_EDGE_DET_BOT_SHF; - video->frame_top = src_tb_edge & VE_SRC_TB_EDGE_DET_TOP; + video->frame_bottom = FIELD_GET(VE_SRC_TB_EDGE_DET_BOT, + src_tb_edge); + video->frame_top = FIELD_GET(VE_SRC_TB_EDGE_DET_TOP, + src_tb_edge); det->vfrontporch = video->frame_top; - det->vbackporch = ((mds & VE_MODE_DETECT_V_LINES) >> - VE_MODE_DETECT_V_LINES_SHF) - video->frame_bottom; - det->vsync = (sync & VE_SYNC_STATUS_VSYNC) >> - VE_SYNC_STATUS_VSYNC_SHF; + det->vbackporch = FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - + video->frame_bottom; + det->vsync = FIELD_GET(VE_SYNC_STATUS_VSYNC, sync); if (video->frame_top > video->frame_bottom) continue; - video->frame_right = (src_lr_edge & VE_SRC_LR_EDGE_DET_RT) >> - VE_SRC_LR_EDGE_DET_RT_SHF; - video->frame_left = src_lr_edge & VE_SRC_LR_EDGE_DET_LEFT; + video->frame_right = FIELD_GET(VE_SRC_LR_EDGE_DET_RT, + src_lr_edge); + video->frame_left = FIELD_GET(VE_SRC_LR_EDGE_DET_LEFT, + src_lr_edge); det->hfrontporch = video->frame_left; det->hbackporch = htotal - video->frame_right; - det->hsync = sync & VE_SYNC_STATUS_HSYNC; + det->hsync = FIELD_GET(VE_SYNC_STATUS_HSYNC, sync); if (video->frame_left > video->frame_right) continue; -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 43+ messages in thread
* [PATCH 2/4] media: aspeed: Use FIELD_GET to improve readability @ 2021-12-17 9:54 ` Jammy Huang 0 siblings, 0 replies; 43+ messages in thread From: Jammy Huang @ 2021-12-17 9:54 UTC (permalink / raw) To: eajames, mchehab, joel, andrew, linux-media, openbmc, linux-arm-kernel, linux-aspeed, linux-kernel Use the bitfield macro FIELD_GET, and GENMASK to do the shift and mask in one go for reg values. Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> --- drivers/media/platform/aspeed-video.c | 35 ++++++++++++--------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c index d5f77b205175..581a4261f9b7 100644 --- a/drivers/media/platform/aspeed-video.c +++ b/drivers/media/platform/aspeed-video.c @@ -156,26 +156,22 @@ #define VE_SRC_LR_EDGE_DET_NO_H BIT(13) #define VE_SRC_LR_EDGE_DET_NO_DISP BIT(14) #define VE_SRC_LR_EDGE_DET_NO_CLK BIT(15) -#define VE_SRC_LR_EDGE_DET_RT_SHF 16 -#define VE_SRC_LR_EDGE_DET_RT GENMASK(27, VE_SRC_LR_EDGE_DET_RT_SHF) +#define VE_SRC_LR_EDGE_DET_RT GENMASK(27, 16) #define VE_SRC_LR_EDGE_DET_INTERLACE BIT(31) #define VE_SRC_TB_EDGE_DET 0x094 #define VE_SRC_TB_EDGE_DET_TOP GENMASK(12, 0) -#define VE_SRC_TB_EDGE_DET_BOT_SHF 16 -#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, 16) #define VE_MODE_DETECT_STATUS 0x098 #define VE_MODE_DETECT_H_PERIOD GENMASK(11, 0) -#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, 16) #define VE_MODE_DETECT_STATUS_VSYNC BIT(28) #define VE_MODE_DETECT_STATUS_HSYNC BIT(29) #define VE_SYNC_STATUS 0x09c #define VE_SYNC_STATUS_HSYNC GENMASK(11, 0) -#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, 16) #define VE_H_TOTAL_PIXELS 0x0A0 @@ -988,23 +984,24 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) 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) >> - VE_SRC_TB_EDGE_DET_BOT_SHF; - video->frame_top = src_tb_edge & VE_SRC_TB_EDGE_DET_TOP; + video->frame_bottom = FIELD_GET(VE_SRC_TB_EDGE_DET_BOT, + src_tb_edge); + video->frame_top = FIELD_GET(VE_SRC_TB_EDGE_DET_TOP, + src_tb_edge); det->vfrontporch = video->frame_top; - det->vbackporch = ((mds & VE_MODE_DETECT_V_LINES) >> - VE_MODE_DETECT_V_LINES_SHF) - video->frame_bottom; - det->vsync = (sync & VE_SYNC_STATUS_VSYNC) >> - VE_SYNC_STATUS_VSYNC_SHF; + det->vbackporch = FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - + video->frame_bottom; + det->vsync = FIELD_GET(VE_SYNC_STATUS_VSYNC, sync); if (video->frame_top > video->frame_bottom) continue; - video->frame_right = (src_lr_edge & VE_SRC_LR_EDGE_DET_RT) >> - VE_SRC_LR_EDGE_DET_RT_SHF; - video->frame_left = src_lr_edge & VE_SRC_LR_EDGE_DET_LEFT; + video->frame_right = FIELD_GET(VE_SRC_LR_EDGE_DET_RT, + src_lr_edge); + video->frame_left = FIELD_GET(VE_SRC_LR_EDGE_DET_LEFT, + src_lr_edge); det->hfrontporch = video->frame_left; det->hbackporch = htotal - video->frame_right; - det->hsync = sync & VE_SYNC_STATUS_HSYNC; + det->hsync = FIELD_GET(VE_SYNC_STATUS_HSYNC, sync); if (video->frame_left > video->frame_right) continue; -- 2.25.1 ^ permalink raw reply related [flat|nested] 43+ messages in thread
* [PATCH 2/4] media: aspeed: Use FIELD_GET to improve readability 2021-12-17 9:54 ` Jammy Huang (?) (?) @ 2021-12-22 0:59 ` Joel Stanley -1 siblings, 0 replies; 43+ messages in thread From: Joel Stanley @ 2021-12-22 0:59 UTC (permalink / raw) To: linux-aspeed On Fri, 17 Dec 2021 at 09:53, Jammy Huang <jammy_huang@aspeedtech.com> wrote: > > Use the bitfield macro FIELD_GET, and GENMASK to do the shift and mask in > one go for reg values. > > Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> > --- > drivers/media/platform/aspeed-video.c | 35 ++++++++++++--------------- > 1 file changed, 16 insertions(+), 19 deletions(-) > > diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c > index d5f77b205175..581a4261f9b7 100644 > --- a/drivers/media/platform/aspeed-video.c > +++ b/drivers/media/platform/aspeed-video.c > @@ -156,26 +156,22 @@ > #define VE_SRC_LR_EDGE_DET_NO_H BIT(13) > #define VE_SRC_LR_EDGE_DET_NO_DISP BIT(14) > #define VE_SRC_LR_EDGE_DET_NO_CLK BIT(15) > -#define VE_SRC_LR_EDGE_DET_RT_SHF 16 > -#define VE_SRC_LR_EDGE_DET_RT GENMASK(27, VE_SRC_LR_EDGE_DET_RT_SHF) > +#define VE_SRC_LR_EDGE_DET_RT GENMASK(27, 16) > #define VE_SRC_LR_EDGE_DET_INTERLACE BIT(31) > > #define VE_SRC_TB_EDGE_DET 0x094 > #define VE_SRC_TB_EDGE_DET_TOP GENMASK(12, 0) > -#define VE_SRC_TB_EDGE_DET_BOT_SHF 16 > -#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, 16) > > #define VE_MODE_DETECT_STATUS 0x098 > #define VE_MODE_DETECT_H_PERIOD GENMASK(11, 0) > -#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, 16) > #define VE_MODE_DETECT_STATUS_VSYNC BIT(28) > #define VE_MODE_DETECT_STATUS_HSYNC BIT(29) > > #define VE_SYNC_STATUS 0x09c > #define VE_SYNC_STATUS_HSYNC GENMASK(11, 0) > -#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, 16) > > #define VE_H_TOTAL_PIXELS 0x0A0 > > @@ -988,23 +984,24 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) > 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) >> > - VE_SRC_TB_EDGE_DET_BOT_SHF; > - video->frame_top = src_tb_edge & VE_SRC_TB_EDGE_DET_TOP; > + video->frame_bottom = FIELD_GET(VE_SRC_TB_EDGE_DET_BOT, > + src_tb_edge); > + video->frame_top = FIELD_GET(VE_SRC_TB_EDGE_DET_TOP, > + src_tb_edge); > det->vfrontporch = video->frame_top; > - det->vbackporch = ((mds & VE_MODE_DETECT_V_LINES) >> > - VE_MODE_DETECT_V_LINES_SHF) - video->frame_bottom; > - det->vsync = (sync & VE_SYNC_STATUS_VSYNC) >> > - VE_SYNC_STATUS_VSYNC_SHF; > + det->vbackporch = FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - > + video->frame_bottom; > + det->vsync = FIELD_GET(VE_SYNC_STATUS_VSYNC, sync); > if (video->frame_top > video->frame_bottom) > continue; > > - video->frame_right = (src_lr_edge & VE_SRC_LR_EDGE_DET_RT) >> > - VE_SRC_LR_EDGE_DET_RT_SHF; > - video->frame_left = src_lr_edge & VE_SRC_LR_EDGE_DET_LEFT; > + video->frame_right = FIELD_GET(VE_SRC_LR_EDGE_DET_RT, > + src_lr_edge); > + video->frame_left = FIELD_GET(VE_SRC_LR_EDGE_DET_LEFT, > + src_lr_edge); I suggest putting these on one line to further improve readability: video->frame_right = FIELD_GET(VE_SRC_LR_EDGE_DET_RT, src_lr_edge); video->frame_left = FIELD_GET(VE_SRC_LR_EDGE_DET_LEFT, src_lr_edge); The same for the other lines you've changed above. And then add: Reviewed-by: Joel Stanley <joel@jms.id.au> > det->hfrontporch = video->frame_left; > det->hbackporch = htotal - video->frame_right; > - det->hsync = sync & VE_SYNC_STATUS_HSYNC; > + det->hsync = FIELD_GET(VE_SYNC_STATUS_HSYNC, sync); > if (video->frame_left > video->frame_right) > continue; > > -- > 2.25.1 > ^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PATCH 2/4] media: aspeed: Use FIELD_GET to improve readability @ 2021-12-22 0:59 ` Joel Stanley 0 siblings, 0 replies; 43+ messages in thread From: Joel Stanley @ 2021-12-22 0:59 UTC (permalink / raw) To: Jammy Huang Cc: Eddie James, Mauro Carvalho Chehab, Andrew Jeffery, linux-media, OpenBMC Maillist, Linux ARM, linux-aspeed, Linux Kernel Mailing List On Fri, 17 Dec 2021 at 09:53, Jammy Huang <jammy_huang@aspeedtech.com> wrote: > > Use the bitfield macro FIELD_GET, and GENMASK to do the shift and mask in > one go for reg values. > > Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> > --- > drivers/media/platform/aspeed-video.c | 35 ++++++++++++--------------- > 1 file changed, 16 insertions(+), 19 deletions(-) > > diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c > index d5f77b205175..581a4261f9b7 100644 > --- a/drivers/media/platform/aspeed-video.c > +++ b/drivers/media/platform/aspeed-video.c > @@ -156,26 +156,22 @@ > #define VE_SRC_LR_EDGE_DET_NO_H BIT(13) > #define VE_SRC_LR_EDGE_DET_NO_DISP BIT(14) > #define VE_SRC_LR_EDGE_DET_NO_CLK BIT(15) > -#define VE_SRC_LR_EDGE_DET_RT_SHF 16 > -#define VE_SRC_LR_EDGE_DET_RT GENMASK(27, VE_SRC_LR_EDGE_DET_RT_SHF) > +#define VE_SRC_LR_EDGE_DET_RT GENMASK(27, 16) > #define VE_SRC_LR_EDGE_DET_INTERLACE BIT(31) > > #define VE_SRC_TB_EDGE_DET 0x094 > #define VE_SRC_TB_EDGE_DET_TOP GENMASK(12, 0) > -#define VE_SRC_TB_EDGE_DET_BOT_SHF 16 > -#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, 16) > > #define VE_MODE_DETECT_STATUS 0x098 > #define VE_MODE_DETECT_H_PERIOD GENMASK(11, 0) > -#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, 16) > #define VE_MODE_DETECT_STATUS_VSYNC BIT(28) > #define VE_MODE_DETECT_STATUS_HSYNC BIT(29) > > #define VE_SYNC_STATUS 0x09c > #define VE_SYNC_STATUS_HSYNC GENMASK(11, 0) > -#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, 16) > > #define VE_H_TOTAL_PIXELS 0x0A0 > > @@ -988,23 +984,24 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) > 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) >> > - VE_SRC_TB_EDGE_DET_BOT_SHF; > - video->frame_top = src_tb_edge & VE_SRC_TB_EDGE_DET_TOP; > + video->frame_bottom = FIELD_GET(VE_SRC_TB_EDGE_DET_BOT, > + src_tb_edge); > + video->frame_top = FIELD_GET(VE_SRC_TB_EDGE_DET_TOP, > + src_tb_edge); > det->vfrontporch = video->frame_top; > - det->vbackporch = ((mds & VE_MODE_DETECT_V_LINES) >> > - VE_MODE_DETECT_V_LINES_SHF) - video->frame_bottom; > - det->vsync = (sync & VE_SYNC_STATUS_VSYNC) >> > - VE_SYNC_STATUS_VSYNC_SHF; > + det->vbackporch = FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - > + video->frame_bottom; > + det->vsync = FIELD_GET(VE_SYNC_STATUS_VSYNC, sync); > if (video->frame_top > video->frame_bottom) > continue; > > - video->frame_right = (src_lr_edge & VE_SRC_LR_EDGE_DET_RT) >> > - VE_SRC_LR_EDGE_DET_RT_SHF; > - video->frame_left = src_lr_edge & VE_SRC_LR_EDGE_DET_LEFT; > + video->frame_right = FIELD_GET(VE_SRC_LR_EDGE_DET_RT, > + src_lr_edge); > + video->frame_left = FIELD_GET(VE_SRC_LR_EDGE_DET_LEFT, > + src_lr_edge); I suggest putting these on one line to further improve readability: video->frame_right = FIELD_GET(VE_SRC_LR_EDGE_DET_RT, src_lr_edge); video->frame_left = FIELD_GET(VE_SRC_LR_EDGE_DET_LEFT, src_lr_edge); The same for the other lines you've changed above. And then add: Reviewed-by: Joel Stanley <joel@jms.id.au> > det->hfrontporch = video->frame_left; > det->hbackporch = htotal - video->frame_right; > - det->hsync = sync & VE_SYNC_STATUS_HSYNC; > + det->hsync = FIELD_GET(VE_SYNC_STATUS_HSYNC, sync); > if (video->frame_left > video->frame_right) > continue; > > -- > 2.25.1 > ^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PATCH 2/4] media: aspeed: Use FIELD_GET to improve readability @ 2021-12-22 0:59 ` Joel Stanley 0 siblings, 0 replies; 43+ messages in thread From: Joel Stanley @ 2021-12-22 0:59 UTC (permalink / raw) To: Jammy Huang Cc: Eddie James, Mauro Carvalho Chehab, Andrew Jeffery, linux-media, OpenBMC Maillist, Linux ARM, linux-aspeed, Linux Kernel Mailing List On Fri, 17 Dec 2021 at 09:53, Jammy Huang <jammy_huang@aspeedtech.com> wrote: > > Use the bitfield macro FIELD_GET, and GENMASK to do the shift and mask in > one go for reg values. > > Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> > --- > drivers/media/platform/aspeed-video.c | 35 ++++++++++++--------------- > 1 file changed, 16 insertions(+), 19 deletions(-) > > diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c > index d5f77b205175..581a4261f9b7 100644 > --- a/drivers/media/platform/aspeed-video.c > +++ b/drivers/media/platform/aspeed-video.c > @@ -156,26 +156,22 @@ > #define VE_SRC_LR_EDGE_DET_NO_H BIT(13) > #define VE_SRC_LR_EDGE_DET_NO_DISP BIT(14) > #define VE_SRC_LR_EDGE_DET_NO_CLK BIT(15) > -#define VE_SRC_LR_EDGE_DET_RT_SHF 16 > -#define VE_SRC_LR_EDGE_DET_RT GENMASK(27, VE_SRC_LR_EDGE_DET_RT_SHF) > +#define VE_SRC_LR_EDGE_DET_RT GENMASK(27, 16) > #define VE_SRC_LR_EDGE_DET_INTERLACE BIT(31) > > #define VE_SRC_TB_EDGE_DET 0x094 > #define VE_SRC_TB_EDGE_DET_TOP GENMASK(12, 0) > -#define VE_SRC_TB_EDGE_DET_BOT_SHF 16 > -#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, 16) > > #define VE_MODE_DETECT_STATUS 0x098 > #define VE_MODE_DETECT_H_PERIOD GENMASK(11, 0) > -#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, 16) > #define VE_MODE_DETECT_STATUS_VSYNC BIT(28) > #define VE_MODE_DETECT_STATUS_HSYNC BIT(29) > > #define VE_SYNC_STATUS 0x09c > #define VE_SYNC_STATUS_HSYNC GENMASK(11, 0) > -#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, 16) > > #define VE_H_TOTAL_PIXELS 0x0A0 > > @@ -988,23 +984,24 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) > 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) >> > - VE_SRC_TB_EDGE_DET_BOT_SHF; > - video->frame_top = src_tb_edge & VE_SRC_TB_EDGE_DET_TOP; > + video->frame_bottom = FIELD_GET(VE_SRC_TB_EDGE_DET_BOT, > + src_tb_edge); > + video->frame_top = FIELD_GET(VE_SRC_TB_EDGE_DET_TOP, > + src_tb_edge); > det->vfrontporch = video->frame_top; > - det->vbackporch = ((mds & VE_MODE_DETECT_V_LINES) >> > - VE_MODE_DETECT_V_LINES_SHF) - video->frame_bottom; > - det->vsync = (sync & VE_SYNC_STATUS_VSYNC) >> > - VE_SYNC_STATUS_VSYNC_SHF; > + det->vbackporch = FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - > + video->frame_bottom; > + det->vsync = FIELD_GET(VE_SYNC_STATUS_VSYNC, sync); > if (video->frame_top > video->frame_bottom) > continue; > > - video->frame_right = (src_lr_edge & VE_SRC_LR_EDGE_DET_RT) >> > - VE_SRC_LR_EDGE_DET_RT_SHF; > - video->frame_left = src_lr_edge & VE_SRC_LR_EDGE_DET_LEFT; > + video->frame_right = FIELD_GET(VE_SRC_LR_EDGE_DET_RT, > + src_lr_edge); > + video->frame_left = FIELD_GET(VE_SRC_LR_EDGE_DET_LEFT, > + src_lr_edge); I suggest putting these on one line to further improve readability: video->frame_right = FIELD_GET(VE_SRC_LR_EDGE_DET_RT, src_lr_edge); video->frame_left = FIELD_GET(VE_SRC_LR_EDGE_DET_LEFT, src_lr_edge); The same for the other lines you've changed above. And then add: Reviewed-by: Joel Stanley <joel@jms.id.au> > det->hfrontporch = video->frame_left; > det->hbackporch = htotal - video->frame_right; > - det->hsync = sync & VE_SYNC_STATUS_HSYNC; > + det->hsync = FIELD_GET(VE_SYNC_STATUS_HSYNC, sync); > if (video->frame_left > video->frame_right) > continue; > > -- > 2.25.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PATCH 2/4] media: aspeed: Use FIELD_GET to improve readability @ 2021-12-22 0:59 ` Joel Stanley 0 siblings, 0 replies; 43+ messages in thread From: Joel Stanley @ 2021-12-22 0:59 UTC (permalink / raw) To: Jammy Huang Cc: linux-aspeed, Andrew Jeffery, OpenBMC Maillist, Eddie James, Linux Kernel Mailing List, Mauro Carvalho Chehab, Linux ARM, linux-media On Fri, 17 Dec 2021 at 09:53, Jammy Huang <jammy_huang@aspeedtech.com> wrote: > > Use the bitfield macro FIELD_GET, and GENMASK to do the shift and mask in > one go for reg values. > > Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> > --- > drivers/media/platform/aspeed-video.c | 35 ++++++++++++--------------- > 1 file changed, 16 insertions(+), 19 deletions(-) > > diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c > index d5f77b205175..581a4261f9b7 100644 > --- a/drivers/media/platform/aspeed-video.c > +++ b/drivers/media/platform/aspeed-video.c > @@ -156,26 +156,22 @@ > #define VE_SRC_LR_EDGE_DET_NO_H BIT(13) > #define VE_SRC_LR_EDGE_DET_NO_DISP BIT(14) > #define VE_SRC_LR_EDGE_DET_NO_CLK BIT(15) > -#define VE_SRC_LR_EDGE_DET_RT_SHF 16 > -#define VE_SRC_LR_EDGE_DET_RT GENMASK(27, VE_SRC_LR_EDGE_DET_RT_SHF) > +#define VE_SRC_LR_EDGE_DET_RT GENMASK(27, 16) > #define VE_SRC_LR_EDGE_DET_INTERLACE BIT(31) > > #define VE_SRC_TB_EDGE_DET 0x094 > #define VE_SRC_TB_EDGE_DET_TOP GENMASK(12, 0) > -#define VE_SRC_TB_EDGE_DET_BOT_SHF 16 > -#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, 16) > > #define VE_MODE_DETECT_STATUS 0x098 > #define VE_MODE_DETECT_H_PERIOD GENMASK(11, 0) > -#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, 16) > #define VE_MODE_DETECT_STATUS_VSYNC BIT(28) > #define VE_MODE_DETECT_STATUS_HSYNC BIT(29) > > #define VE_SYNC_STATUS 0x09c > #define VE_SYNC_STATUS_HSYNC GENMASK(11, 0) > -#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, 16) > > #define VE_H_TOTAL_PIXELS 0x0A0 > > @@ -988,23 +984,24 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) > 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) >> > - VE_SRC_TB_EDGE_DET_BOT_SHF; > - video->frame_top = src_tb_edge & VE_SRC_TB_EDGE_DET_TOP; > + video->frame_bottom = FIELD_GET(VE_SRC_TB_EDGE_DET_BOT, > + src_tb_edge); > + video->frame_top = FIELD_GET(VE_SRC_TB_EDGE_DET_TOP, > + src_tb_edge); > det->vfrontporch = video->frame_top; > - det->vbackporch = ((mds & VE_MODE_DETECT_V_LINES) >> > - VE_MODE_DETECT_V_LINES_SHF) - video->frame_bottom; > - det->vsync = (sync & VE_SYNC_STATUS_VSYNC) >> > - VE_SYNC_STATUS_VSYNC_SHF; > + det->vbackporch = FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - > + video->frame_bottom; > + det->vsync = FIELD_GET(VE_SYNC_STATUS_VSYNC, sync); > if (video->frame_top > video->frame_bottom) > continue; > > - video->frame_right = (src_lr_edge & VE_SRC_LR_EDGE_DET_RT) >> > - VE_SRC_LR_EDGE_DET_RT_SHF; > - video->frame_left = src_lr_edge & VE_SRC_LR_EDGE_DET_LEFT; > + video->frame_right = FIELD_GET(VE_SRC_LR_EDGE_DET_RT, > + src_lr_edge); > + video->frame_left = FIELD_GET(VE_SRC_LR_EDGE_DET_LEFT, > + src_lr_edge); I suggest putting these on one line to further improve readability: video->frame_right = FIELD_GET(VE_SRC_LR_EDGE_DET_RT, src_lr_edge); video->frame_left = FIELD_GET(VE_SRC_LR_EDGE_DET_LEFT, src_lr_edge); The same for the other lines you've changed above. And then add: Reviewed-by: Joel Stanley <joel@jms.id.au> > det->hfrontporch = video->frame_left; > det->hbackporch = htotal - video->frame_right; > - det->hsync = sync & VE_SYNC_STATUS_HSYNC; > + det->hsync = FIELD_GET(VE_SYNC_STATUS_HSYNC, sync); > if (video->frame_left > video->frame_right) > continue; > > -- > 2.25.1 > ^ permalink raw reply [flat|nested] 43+ messages in thread
* [PATCH 2/4] media: aspeed: Use FIELD_GET to improve readability 2021-12-22 0:59 ` Joel Stanley (?) (?) @ 2021-12-22 6:10 ` Jammy Huang -1 siblings, 0 replies; 43+ messages in thread From: Jammy Huang @ 2021-12-22 6:10 UTC (permalink / raw) To: linux-aspeed Hi Joel, OK, I will update in next patch as you advised. Thanks for your review. On 2021/12/22 ?? 08:59, Joel Stanley wrote: > On Fri, 17 Dec 2021 at 09:53, Jammy Huang <jammy_huang@aspeedtech.com> wrote: >> Use the bitfield macro FIELD_GET, and GENMASK to do the shift and mask in >> one go for reg values. >> >> Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> >> --- >> drivers/media/platform/aspeed-video.c | 35 ++++++++++++--------------- >> 1 file changed, 16 insertions(+), 19 deletions(-) >> >> diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c >> index d5f77b205175..581a4261f9b7 100644 >> --- a/drivers/media/platform/aspeed-video.c >> +++ b/drivers/media/platform/aspeed-video.c >> @@ -156,26 +156,22 @@ >> #define VE_SRC_LR_EDGE_DET_NO_H BIT(13) >> #define VE_SRC_LR_EDGE_DET_NO_DISP BIT(14) >> #define VE_SRC_LR_EDGE_DET_NO_CLK BIT(15) >> -#define VE_SRC_LR_EDGE_DET_RT_SHF 16 >> -#define VE_SRC_LR_EDGE_DET_RT GENMASK(27, VE_SRC_LR_EDGE_DET_RT_SHF) >> +#define VE_SRC_LR_EDGE_DET_RT GENMASK(27, 16) >> #define VE_SRC_LR_EDGE_DET_INTERLACE BIT(31) >> >> #define VE_SRC_TB_EDGE_DET 0x094 >> #define VE_SRC_TB_EDGE_DET_TOP GENMASK(12, 0) >> -#define VE_SRC_TB_EDGE_DET_BOT_SHF 16 >> -#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, 16) >> >> #define VE_MODE_DETECT_STATUS 0x098 >> #define VE_MODE_DETECT_H_PERIOD GENMASK(11, 0) >> -#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, 16) >> #define VE_MODE_DETECT_STATUS_VSYNC BIT(28) >> #define VE_MODE_DETECT_STATUS_HSYNC BIT(29) >> >> #define VE_SYNC_STATUS 0x09c >> #define VE_SYNC_STATUS_HSYNC GENMASK(11, 0) >> -#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, 16) >> >> #define VE_H_TOTAL_PIXELS 0x0A0 >> >> @@ -988,23 +984,24 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) >> 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) >> >> - VE_SRC_TB_EDGE_DET_BOT_SHF; >> - video->frame_top = src_tb_edge & VE_SRC_TB_EDGE_DET_TOP; >> + video->frame_bottom = FIELD_GET(VE_SRC_TB_EDGE_DET_BOT, >> + src_tb_edge); >> + video->frame_top = FIELD_GET(VE_SRC_TB_EDGE_DET_TOP, >> + src_tb_edge); >> det->vfrontporch = video->frame_top; >> - det->vbackporch = ((mds & VE_MODE_DETECT_V_LINES) >> >> - VE_MODE_DETECT_V_LINES_SHF) - video->frame_bottom; >> - det->vsync = (sync & VE_SYNC_STATUS_VSYNC) >> >> - VE_SYNC_STATUS_VSYNC_SHF; >> + det->vbackporch = FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - >> + video->frame_bottom; >> + det->vsync = FIELD_GET(VE_SYNC_STATUS_VSYNC, sync); >> if (video->frame_top > video->frame_bottom) >> continue; >> >> - video->frame_right = (src_lr_edge & VE_SRC_LR_EDGE_DET_RT) >> >> - VE_SRC_LR_EDGE_DET_RT_SHF; >> - video->frame_left = src_lr_edge & VE_SRC_LR_EDGE_DET_LEFT; >> + video->frame_right = FIELD_GET(VE_SRC_LR_EDGE_DET_RT, >> + src_lr_edge); >> + video->frame_left = FIELD_GET(VE_SRC_LR_EDGE_DET_LEFT, >> + src_lr_edge); > I suggest putting these on one line to further improve readability: > > video->frame_right = FIELD_GET(VE_SRC_LR_EDGE_DET_RT, > src_lr_edge); > video->frame_left = FIELD_GET(VE_SRC_LR_EDGE_DET_LEFT, > src_lr_edge); > > The same for the other lines you've changed above. > > And then add: > > Reviewed-by: Joel Stanley <joel@jms.id.au> > >> det->hfrontporch = video->frame_left; >> det->hbackporch = htotal - video->frame_right; >> - det->hsync = sync & VE_SYNC_STATUS_HSYNC; >> + det->hsync = FIELD_GET(VE_SYNC_STATUS_HSYNC, sync); >> if (video->frame_left > video->frame_right) >> continue; >> >> -- >> 2.25.1 >> -- Best Regards Jammy ^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PATCH 2/4] media: aspeed: Use FIELD_GET to improve readability @ 2021-12-22 6:10 ` Jammy Huang 0 siblings, 0 replies; 43+ messages in thread From: Jammy Huang @ 2021-12-22 6:10 UTC (permalink / raw) To: Joel Stanley Cc: Eddie James, Mauro Carvalho Chehab, Andrew Jeffery, linux-media@vger.kernel.org, OpenBMC Maillist, Linux ARM, linux-aspeed, Linux Kernel Mailing List Hi Joel, OK, I will update in next patch as you advised. Thanks for your review. On 2021/12/22 上午 08:59, Joel Stanley wrote: > On Fri, 17 Dec 2021 at 09:53, Jammy Huang <jammy_huang@aspeedtech.com> wrote: >> Use the bitfield macro FIELD_GET, and GENMASK to do the shift and mask in >> one go for reg values. >> >> Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> >> --- >> drivers/media/platform/aspeed-video.c | 35 ++++++++++++--------------- >> 1 file changed, 16 insertions(+), 19 deletions(-) >> >> diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c >> index d5f77b205175..581a4261f9b7 100644 >> --- a/drivers/media/platform/aspeed-video.c >> +++ b/drivers/media/platform/aspeed-video.c >> @@ -156,26 +156,22 @@ >> #define VE_SRC_LR_EDGE_DET_NO_H BIT(13) >> #define VE_SRC_LR_EDGE_DET_NO_DISP BIT(14) >> #define VE_SRC_LR_EDGE_DET_NO_CLK BIT(15) >> -#define VE_SRC_LR_EDGE_DET_RT_SHF 16 >> -#define VE_SRC_LR_EDGE_DET_RT GENMASK(27, VE_SRC_LR_EDGE_DET_RT_SHF) >> +#define VE_SRC_LR_EDGE_DET_RT GENMASK(27, 16) >> #define VE_SRC_LR_EDGE_DET_INTERLACE BIT(31) >> >> #define VE_SRC_TB_EDGE_DET 0x094 >> #define VE_SRC_TB_EDGE_DET_TOP GENMASK(12, 0) >> -#define VE_SRC_TB_EDGE_DET_BOT_SHF 16 >> -#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, 16) >> >> #define VE_MODE_DETECT_STATUS 0x098 >> #define VE_MODE_DETECT_H_PERIOD GENMASK(11, 0) >> -#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, 16) >> #define VE_MODE_DETECT_STATUS_VSYNC BIT(28) >> #define VE_MODE_DETECT_STATUS_HSYNC BIT(29) >> >> #define VE_SYNC_STATUS 0x09c >> #define VE_SYNC_STATUS_HSYNC GENMASK(11, 0) >> -#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, 16) >> >> #define VE_H_TOTAL_PIXELS 0x0A0 >> >> @@ -988,23 +984,24 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) >> 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) >> >> - VE_SRC_TB_EDGE_DET_BOT_SHF; >> - video->frame_top = src_tb_edge & VE_SRC_TB_EDGE_DET_TOP; >> + video->frame_bottom = FIELD_GET(VE_SRC_TB_EDGE_DET_BOT, >> + src_tb_edge); >> + video->frame_top = FIELD_GET(VE_SRC_TB_EDGE_DET_TOP, >> + src_tb_edge); >> det->vfrontporch = video->frame_top; >> - det->vbackporch = ((mds & VE_MODE_DETECT_V_LINES) >> >> - VE_MODE_DETECT_V_LINES_SHF) - video->frame_bottom; >> - det->vsync = (sync & VE_SYNC_STATUS_VSYNC) >> >> - VE_SYNC_STATUS_VSYNC_SHF; >> + det->vbackporch = FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - >> + video->frame_bottom; >> + det->vsync = FIELD_GET(VE_SYNC_STATUS_VSYNC, sync); >> if (video->frame_top > video->frame_bottom) >> continue; >> >> - video->frame_right = (src_lr_edge & VE_SRC_LR_EDGE_DET_RT) >> >> - VE_SRC_LR_EDGE_DET_RT_SHF; >> - video->frame_left = src_lr_edge & VE_SRC_LR_EDGE_DET_LEFT; >> + video->frame_right = FIELD_GET(VE_SRC_LR_EDGE_DET_RT, >> + src_lr_edge); >> + video->frame_left = FIELD_GET(VE_SRC_LR_EDGE_DET_LEFT, >> + src_lr_edge); > I suggest putting these on one line to further improve readability: > > video->frame_right = FIELD_GET(VE_SRC_LR_EDGE_DET_RT, > src_lr_edge); > video->frame_left = FIELD_GET(VE_SRC_LR_EDGE_DET_LEFT, > src_lr_edge); > > The same for the other lines you've changed above. > > And then add: > > Reviewed-by: Joel Stanley <joel@jms.id.au> > >> det->hfrontporch = video->frame_left; >> det->hbackporch = htotal - video->frame_right; >> - det->hsync = sync & VE_SYNC_STATUS_HSYNC; >> + det->hsync = FIELD_GET(VE_SYNC_STATUS_HSYNC, sync); >> if (video->frame_left > video->frame_right) >> continue; >> >> -- >> 2.25.1 >> -- Best Regards Jammy ^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PATCH 2/4] media: aspeed: Use FIELD_GET to improve readability @ 2021-12-22 6:10 ` Jammy Huang 0 siblings, 0 replies; 43+ messages in thread From: Jammy Huang @ 2021-12-22 6:10 UTC (permalink / raw) To: Joel Stanley Cc: Eddie James, Mauro Carvalho Chehab, Andrew Jeffery, linux-media@vger.kernel.org, OpenBMC Maillist, Linux ARM, linux-aspeed, Linux Kernel Mailing List Hi Joel, OK, I will update in next patch as you advised. Thanks for your review. On 2021/12/22 上午 08:59, Joel Stanley wrote: > On Fri, 17 Dec 2021 at 09:53, Jammy Huang <jammy_huang@aspeedtech.com> wrote: >> Use the bitfield macro FIELD_GET, and GENMASK to do the shift and mask in >> one go for reg values. >> >> Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> >> --- >> drivers/media/platform/aspeed-video.c | 35 ++++++++++++--------------- >> 1 file changed, 16 insertions(+), 19 deletions(-) >> >> diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c >> index d5f77b205175..581a4261f9b7 100644 >> --- a/drivers/media/platform/aspeed-video.c >> +++ b/drivers/media/platform/aspeed-video.c >> @@ -156,26 +156,22 @@ >> #define VE_SRC_LR_EDGE_DET_NO_H BIT(13) >> #define VE_SRC_LR_EDGE_DET_NO_DISP BIT(14) >> #define VE_SRC_LR_EDGE_DET_NO_CLK BIT(15) >> -#define VE_SRC_LR_EDGE_DET_RT_SHF 16 >> -#define VE_SRC_LR_EDGE_DET_RT GENMASK(27, VE_SRC_LR_EDGE_DET_RT_SHF) >> +#define VE_SRC_LR_EDGE_DET_RT GENMASK(27, 16) >> #define VE_SRC_LR_EDGE_DET_INTERLACE BIT(31) >> >> #define VE_SRC_TB_EDGE_DET 0x094 >> #define VE_SRC_TB_EDGE_DET_TOP GENMASK(12, 0) >> -#define VE_SRC_TB_EDGE_DET_BOT_SHF 16 >> -#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, 16) >> >> #define VE_MODE_DETECT_STATUS 0x098 >> #define VE_MODE_DETECT_H_PERIOD GENMASK(11, 0) >> -#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, 16) >> #define VE_MODE_DETECT_STATUS_VSYNC BIT(28) >> #define VE_MODE_DETECT_STATUS_HSYNC BIT(29) >> >> #define VE_SYNC_STATUS 0x09c >> #define VE_SYNC_STATUS_HSYNC GENMASK(11, 0) >> -#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, 16) >> >> #define VE_H_TOTAL_PIXELS 0x0A0 >> >> @@ -988,23 +984,24 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) >> 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) >> >> - VE_SRC_TB_EDGE_DET_BOT_SHF; >> - video->frame_top = src_tb_edge & VE_SRC_TB_EDGE_DET_TOP; >> + video->frame_bottom = FIELD_GET(VE_SRC_TB_EDGE_DET_BOT, >> + src_tb_edge); >> + video->frame_top = FIELD_GET(VE_SRC_TB_EDGE_DET_TOP, >> + src_tb_edge); >> det->vfrontporch = video->frame_top; >> - det->vbackporch = ((mds & VE_MODE_DETECT_V_LINES) >> >> - VE_MODE_DETECT_V_LINES_SHF) - video->frame_bottom; >> - det->vsync = (sync & VE_SYNC_STATUS_VSYNC) >> >> - VE_SYNC_STATUS_VSYNC_SHF; >> + det->vbackporch = FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - >> + video->frame_bottom; >> + det->vsync = FIELD_GET(VE_SYNC_STATUS_VSYNC, sync); >> if (video->frame_top > video->frame_bottom) >> continue; >> >> - video->frame_right = (src_lr_edge & VE_SRC_LR_EDGE_DET_RT) >> >> - VE_SRC_LR_EDGE_DET_RT_SHF; >> - video->frame_left = src_lr_edge & VE_SRC_LR_EDGE_DET_LEFT; >> + video->frame_right = FIELD_GET(VE_SRC_LR_EDGE_DET_RT, >> + src_lr_edge); >> + video->frame_left = FIELD_GET(VE_SRC_LR_EDGE_DET_LEFT, >> + src_lr_edge); > I suggest putting these on one line to further improve readability: > > video->frame_right = FIELD_GET(VE_SRC_LR_EDGE_DET_RT, > src_lr_edge); > video->frame_left = FIELD_GET(VE_SRC_LR_EDGE_DET_LEFT, > src_lr_edge); > > The same for the other lines you've changed above. > > And then add: > > Reviewed-by: Joel Stanley <joel@jms.id.au> > >> det->hfrontporch = video->frame_left; >> det->hbackporch = htotal - video->frame_right; >> - det->hsync = sync & VE_SYNC_STATUS_HSYNC; >> + det->hsync = FIELD_GET(VE_SYNC_STATUS_HSYNC, sync); >> if (video->frame_left > video->frame_right) >> continue; >> >> -- >> 2.25.1 >> -- Best Regards Jammy _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PATCH 2/4] media: aspeed: Use FIELD_GET to improve readability @ 2021-12-22 6:10 ` Jammy Huang 0 siblings, 0 replies; 43+ messages in thread From: Jammy Huang @ 2021-12-22 6:10 UTC (permalink / raw) To: Joel Stanley Cc: linux-aspeed, Andrew Jeffery, OpenBMC Maillist, Eddie James, Linux Kernel Mailing List, Mauro Carvalho Chehab, Linux ARM, linux-media@vger.kernel.org Hi Joel, OK, I will update in next patch as you advised. Thanks for your review. On 2021/12/22 上午 08:59, Joel Stanley wrote: > On Fri, 17 Dec 2021 at 09:53, Jammy Huang <jammy_huang@aspeedtech.com> wrote: >> Use the bitfield macro FIELD_GET, and GENMASK to do the shift and mask in >> one go for reg values. >> >> Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> >> --- >> drivers/media/platform/aspeed-video.c | 35 ++++++++++++--------------- >> 1 file changed, 16 insertions(+), 19 deletions(-) >> >> diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c >> index d5f77b205175..581a4261f9b7 100644 >> --- a/drivers/media/platform/aspeed-video.c >> +++ b/drivers/media/platform/aspeed-video.c >> @@ -156,26 +156,22 @@ >> #define VE_SRC_LR_EDGE_DET_NO_H BIT(13) >> #define VE_SRC_LR_EDGE_DET_NO_DISP BIT(14) >> #define VE_SRC_LR_EDGE_DET_NO_CLK BIT(15) >> -#define VE_SRC_LR_EDGE_DET_RT_SHF 16 >> -#define VE_SRC_LR_EDGE_DET_RT GENMASK(27, VE_SRC_LR_EDGE_DET_RT_SHF) >> +#define VE_SRC_LR_EDGE_DET_RT GENMASK(27, 16) >> #define VE_SRC_LR_EDGE_DET_INTERLACE BIT(31) >> >> #define VE_SRC_TB_EDGE_DET 0x094 >> #define VE_SRC_TB_EDGE_DET_TOP GENMASK(12, 0) >> -#define VE_SRC_TB_EDGE_DET_BOT_SHF 16 >> -#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, 16) >> >> #define VE_MODE_DETECT_STATUS 0x098 >> #define VE_MODE_DETECT_H_PERIOD GENMASK(11, 0) >> -#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, 16) >> #define VE_MODE_DETECT_STATUS_VSYNC BIT(28) >> #define VE_MODE_DETECT_STATUS_HSYNC BIT(29) >> >> #define VE_SYNC_STATUS 0x09c >> #define VE_SYNC_STATUS_HSYNC GENMASK(11, 0) >> -#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, 16) >> >> #define VE_H_TOTAL_PIXELS 0x0A0 >> >> @@ -988,23 +984,24 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) >> 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) >> >> - VE_SRC_TB_EDGE_DET_BOT_SHF; >> - video->frame_top = src_tb_edge & VE_SRC_TB_EDGE_DET_TOP; >> + video->frame_bottom = FIELD_GET(VE_SRC_TB_EDGE_DET_BOT, >> + src_tb_edge); >> + video->frame_top = FIELD_GET(VE_SRC_TB_EDGE_DET_TOP, >> + src_tb_edge); >> det->vfrontporch = video->frame_top; >> - det->vbackporch = ((mds & VE_MODE_DETECT_V_LINES) >> >> - VE_MODE_DETECT_V_LINES_SHF) - video->frame_bottom; >> - det->vsync = (sync & VE_SYNC_STATUS_VSYNC) >> >> - VE_SYNC_STATUS_VSYNC_SHF; >> + det->vbackporch = FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - >> + video->frame_bottom; >> + det->vsync = FIELD_GET(VE_SYNC_STATUS_VSYNC, sync); >> if (video->frame_top > video->frame_bottom) >> continue; >> >> - video->frame_right = (src_lr_edge & VE_SRC_LR_EDGE_DET_RT) >> >> - VE_SRC_LR_EDGE_DET_RT_SHF; >> - video->frame_left = src_lr_edge & VE_SRC_LR_EDGE_DET_LEFT; >> + video->frame_right = FIELD_GET(VE_SRC_LR_EDGE_DET_RT, >> + src_lr_edge); >> + video->frame_left = FIELD_GET(VE_SRC_LR_EDGE_DET_LEFT, >> + src_lr_edge); > I suggest putting these on one line to further improve readability: > > video->frame_right = FIELD_GET(VE_SRC_LR_EDGE_DET_RT, > src_lr_edge); > video->frame_left = FIELD_GET(VE_SRC_LR_EDGE_DET_LEFT, > src_lr_edge); > > The same for the other lines you've changed above. > > And then add: > > Reviewed-by: Joel Stanley <joel@jms.id.au> > >> det->hfrontporch = video->frame_left; >> det->hbackporch = htotal - video->frame_right; >> - det->hsync = sync & VE_SYNC_STATUS_HSYNC; >> + det->hsync = FIELD_GET(VE_SYNC_STATUS_HSYNC, sync); >> if (video->frame_left > video->frame_right) >> continue; >> >> -- >> 2.25.1 >> -- Best Regards Jammy ^ permalink raw reply [flat|nested] 43+ messages in thread
* [PATCH 3/4] media: aspeed: Correct values for detected timing 2021-12-17 9:53 ` Jammy Huang (?) @ 2021-12-17 9:54 ` Jammy Huang -1 siblings, 0 replies; 43+ messages in thread From: Jammy Huang @ 2021-12-17 9:54 UTC (permalink / raw) To: linux-aspeed Correct timing's fp/sync/bp value based on the information below. It should be noticed that the calculation formula should be changed per sync polarity. The sequence of signal: sync - backporch - video data - frontporch The following registers start counting from sync's rising edge: 1. VR090: frame edge's left and right 2. VR094: frame edge's top and bottom 3. VR09C: counting from sync's rising edge to falling edge +--+ +-------------------+ +--+ | | | v i d e o | | | +--+ +-----+ +-----+ +---+ sync+--+ left/top+--------+ right/bottom+----------------------------+ +-------------------+ | v i d e o | +--+ +-----+ +-----+ +---+ | | | | +--+ +--+ sync+-------------------------------+ left/top+-----+ right/bottom+-------------------------+ Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> --- drivers/media/platform/aspeed-video.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c index 581a4261f9b7..5ad3a20c5bac 100644 --- a/drivers/media/platform/aspeed-video.c +++ b/drivers/media/platform/aspeed-video.c @@ -988,10 +988,20 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) src_tb_edge); video->frame_top = FIELD_GET(VE_SRC_TB_EDGE_DET_TOP, src_tb_edge); - det->vfrontporch = video->frame_top; - det->vbackporch = FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - - video->frame_bottom; det->vsync = FIELD_GET(VE_SYNC_STATUS_VSYNC, sync); + if (det->polarities & V4L2_DV_VSYNC_POS_POL) { + det->vbackporch = video->frame_top - det->vsync; + det->vfrontporch = + FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - + video->frame_bottom; + } else { + det->vsync = FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - + det->vsync; + det->vbackporch = video->frame_top; + det->vfrontporch = + FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - + video->frame_bottom - det->vsync; + } if (video->frame_top > video->frame_bottom) continue; @@ -999,9 +1009,16 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) src_lr_edge); video->frame_left = FIELD_GET(VE_SRC_LR_EDGE_DET_LEFT, src_lr_edge); - det->hfrontporch = video->frame_left; - det->hbackporch = htotal - video->frame_right; det->hsync = FIELD_GET(VE_SYNC_STATUS_HSYNC, sync); + if (det->polarities & V4L2_DV_HSYNC_POS_POL) { + det->hbackporch = video->frame_left - det->hsync; + det->hfrontporch = htotal - video->frame_right; + } else { + det->hsync = htotal - det->hsync; + det->hbackporch = video->frame_left; + det->hfrontporch = htotal - video->frame_right - + det->hsync; + } if (video->frame_left > video->frame_right) continue; -- 2.25.1 ^ permalink raw reply related [flat|nested] 43+ messages in thread
* [PATCH 3/4] media: aspeed: Correct values for detected timing @ 2021-12-17 9:54 ` Jammy Huang 0 siblings, 0 replies; 43+ messages in thread From: Jammy Huang @ 2021-12-17 9:54 UTC (permalink / raw) To: eajames, mchehab, joel, andrew, linux-media, openbmc, linux-arm-kernel, linux-aspeed, linux-kernel Correct timing's fp/sync/bp value based on the information below. It should be noticed that the calculation formula should be changed per sync polarity. The sequence of signal: sync - backporch - video data - frontporch The following registers start counting from sync's rising edge: 1. VR090: frame edge's left and right 2. VR094: frame edge's top and bottom 3. VR09C: counting from sync's rising edge to falling edge +--+ +-------------------+ +--+ | | | v i d e o | | | +--+ +-----+ +-----+ +---+ sync+--+ left/top+--------+ right/bottom+----------------------------+ +-------------------+ | v i d e o | +--+ +-----+ +-----+ +---+ | | | | +--+ +--+ sync+-------------------------------+ left/top+-----+ right/bottom+-------------------------+ Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> --- drivers/media/platform/aspeed-video.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c index 581a4261f9b7..5ad3a20c5bac 100644 --- a/drivers/media/platform/aspeed-video.c +++ b/drivers/media/platform/aspeed-video.c @@ -988,10 +988,20 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) src_tb_edge); video->frame_top = FIELD_GET(VE_SRC_TB_EDGE_DET_TOP, src_tb_edge); - det->vfrontporch = video->frame_top; - det->vbackporch = FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - - video->frame_bottom; det->vsync = FIELD_GET(VE_SYNC_STATUS_VSYNC, sync); + if (det->polarities & V4L2_DV_VSYNC_POS_POL) { + det->vbackporch = video->frame_top - det->vsync; + det->vfrontporch = + FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - + video->frame_bottom; + } else { + det->vsync = FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - + det->vsync; + det->vbackporch = video->frame_top; + det->vfrontporch = + FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - + video->frame_bottom - det->vsync; + } if (video->frame_top > video->frame_bottom) continue; @@ -999,9 +1009,16 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) src_lr_edge); video->frame_left = FIELD_GET(VE_SRC_LR_EDGE_DET_LEFT, src_lr_edge); - det->hfrontporch = video->frame_left; - det->hbackporch = htotal - video->frame_right; det->hsync = FIELD_GET(VE_SYNC_STATUS_HSYNC, sync); + if (det->polarities & V4L2_DV_HSYNC_POS_POL) { + det->hbackporch = video->frame_left - det->hsync; + det->hfrontporch = htotal - video->frame_right; + } else { + det->hsync = htotal - det->hsync; + det->hbackporch = video->frame_left; + det->hfrontporch = htotal - video->frame_right - + det->hsync; + } if (video->frame_left > video->frame_right) continue; -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 43+ messages in thread
* [PATCH 3/4] media: aspeed: Correct values for detected timing @ 2021-12-17 9:54 ` Jammy Huang 0 siblings, 0 replies; 43+ messages in thread From: Jammy Huang @ 2021-12-17 9:54 UTC (permalink / raw) To: eajames, mchehab, joel, andrew, linux-media, openbmc, linux-arm-kernel, linux-aspeed, linux-kernel Correct timing's fp/sync/bp value based on the information below. It should be noticed that the calculation formula should be changed per sync polarity. The sequence of signal: sync - backporch - video data - frontporch The following registers start counting from sync's rising edge: 1. VR090: frame edge's left and right 2. VR094: frame edge's top and bottom 3. VR09C: counting from sync's rising edge to falling edge +--+ +-------------------+ +--+ | | | v i d e o | | | +--+ +-----+ +-----+ +---+ sync+--+ left/top+--------+ right/bottom+----------------------------+ +-------------------+ | v i d e o | +--+ +-----+ +-----+ +---+ | | | | +--+ +--+ sync+-------------------------------+ left/top+-----+ right/bottom+-------------------------+ Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> --- drivers/media/platform/aspeed-video.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c index 581a4261f9b7..5ad3a20c5bac 100644 --- a/drivers/media/platform/aspeed-video.c +++ b/drivers/media/platform/aspeed-video.c @@ -988,10 +988,20 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) src_tb_edge); video->frame_top = FIELD_GET(VE_SRC_TB_EDGE_DET_TOP, src_tb_edge); - det->vfrontporch = video->frame_top; - det->vbackporch = FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - - video->frame_bottom; det->vsync = FIELD_GET(VE_SYNC_STATUS_VSYNC, sync); + if (det->polarities & V4L2_DV_VSYNC_POS_POL) { + det->vbackporch = video->frame_top - det->vsync; + det->vfrontporch = + FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - + video->frame_bottom; + } else { + det->vsync = FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - + det->vsync; + det->vbackporch = video->frame_top; + det->vfrontporch = + FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - + video->frame_bottom - det->vsync; + } if (video->frame_top > video->frame_bottom) continue; @@ -999,9 +1009,16 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) src_lr_edge); video->frame_left = FIELD_GET(VE_SRC_LR_EDGE_DET_LEFT, src_lr_edge); - det->hfrontporch = video->frame_left; - det->hbackporch = htotal - video->frame_right; det->hsync = FIELD_GET(VE_SYNC_STATUS_HSYNC, sync); + if (det->polarities & V4L2_DV_HSYNC_POS_POL) { + det->hbackporch = video->frame_left - det->hsync; + det->hfrontporch = htotal - video->frame_right; + } else { + det->hsync = htotal - det->hsync; + det->hbackporch = video->frame_left; + det->hfrontporch = htotal - video->frame_right - + det->hsync; + } if (video->frame_left > video->frame_right) continue; -- 2.25.1 ^ permalink raw reply related [flat|nested] 43+ messages in thread
* [PATCH 3/4] media: aspeed: Correct values for detected timing 2021-12-17 9:54 ` Jammy Huang (?) (?) @ 2021-12-22 1:31 ` Joel Stanley -1 siblings, 0 replies; 43+ messages in thread From: Joel Stanley @ 2021-12-22 1:31 UTC (permalink / raw) To: linux-aspeed On Fri, 17 Dec 2021 at 09:54, Jammy Huang <jammy_huang@aspeedtech.com> wrote: > > Correct timing's fp/sync/bp value based on the information below. > It should be noticed that the calculation formula should be changed > per sync polarity. > > The sequence of signal: sync - backporch - video data - frontporch > > The following registers start counting from sync's rising edge: > 1. VR090: frame edge's left and right > 2. VR094: frame edge's top and bottom > 3. VR09C: counting from sync's rising edge to falling edge > > +--+ +-------------------+ +--+ > | | | v i d e o | | | > +--+ +-----+ +-----+ +---+ > > sync+--+ > left/top+--------+ > right/bottom+----------------------------+ > > +-------------------+ > | v i d e o | > +--+ +-----+ +-----+ +---+ > | | | | > +--+ +--+ > sync+-------------------------------+ > left/top+-----+ > right/bottom+-------------------------+ This is a good explanation. Can you add detail that relates the names you use here to to the variable names in your patch (or change them to match)? > > Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> > --- > drivers/media/platform/aspeed-video.c | 27 ++++++++++++++++++++++----- > 1 file changed, 22 insertions(+), 5 deletions(-) > > diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c > index 581a4261f9b7..5ad3a20c5bac 100644 > --- a/drivers/media/platform/aspeed-video.c > +++ b/drivers/media/platform/aspeed-video.c > @@ -988,10 +988,20 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) > src_tb_edge); > video->frame_top = FIELD_GET(VE_SRC_TB_EDGE_DET_TOP, > src_tb_edge); > - det->vfrontporch = video->frame_top; > - det->vbackporch = FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - > - video->frame_bottom; > det->vsync = FIELD_GET(VE_SYNC_STATUS_VSYNC, sync); Would it be clearer if you structured the code like this? vsync = FIELD_GET(VE_SYNC_STATUS_VSYNC, sync); vlines = FIELD_GET(VE_MODE_DETECT_V_LINES, mds); if (det->polarities & V4L2_DV_VSYNC_POS_POL)) { det->vbackporch = video->frame_top - vsync; det->vfrontporch = vlines - video->frame_bottom; det->vsync = vsync; } else { det->vbackporch = video->frame_top; det->vfrontporch = vlines - video->frame_bottom - vsync; det->vsync = vlines - vsync; } > + if (det->polarities & V4L2_DV_VSYNC_POS_POL) { > + det->vbackporch = video->frame_top - det->vsync; > + det->vfrontporch = > + FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - > + video->frame_bottom; > + } else { > + det->vsync = FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - > + det->vsync; > + det->vbackporch = video->frame_top; > + det->vfrontporch = > + FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - > + video->frame_bottom - det->vsync; > + } > if (video->frame_top > video->frame_bottom) > continue; > > @@ -999,9 +1009,16 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) > src_lr_edge); > video->frame_left = FIELD_GET(VE_SRC_LR_EDGE_DET_LEFT, > src_lr_edge); > - det->hfrontporch = video->frame_left; > - det->hbackporch = htotal - video->frame_right; > det->hsync = FIELD_GET(VE_SYNC_STATUS_HSYNC, sync); > + if (det->polarities & V4L2_DV_HSYNC_POS_POL) { > + det->hbackporch = video->frame_left - det->hsync; > + det->hfrontporch = htotal - video->frame_right; > + } else { > + det->hsync = htotal - det->hsync; > + det->hbackporch = video->frame_left; > + det->hfrontporch = htotal - video->frame_right - > + det->hsync; > + } > if (video->frame_left > video->frame_right) > continue; > > -- > 2.25.1 > ^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PATCH 3/4] media: aspeed: Correct values for detected timing @ 2021-12-22 1:31 ` Joel Stanley 0 siblings, 0 replies; 43+ messages in thread From: Joel Stanley @ 2021-12-22 1:31 UTC (permalink / raw) To: Jammy Huang Cc: Eddie James, Mauro Carvalho Chehab, Andrew Jeffery, linux-media, OpenBMC Maillist, Linux ARM, linux-aspeed, Linux Kernel Mailing List On Fri, 17 Dec 2021 at 09:54, Jammy Huang <jammy_huang@aspeedtech.com> wrote: > > Correct timing's fp/sync/bp value based on the information below. > It should be noticed that the calculation formula should be changed > per sync polarity. > > The sequence of signal: sync - backporch - video data - frontporch > > The following registers start counting from sync's rising edge: > 1. VR090: frame edge's left and right > 2. VR094: frame edge's top and bottom > 3. VR09C: counting from sync's rising edge to falling edge > > +--+ +-------------------+ +--+ > | | | v i d e o | | | > +--+ +-----+ +-----+ +---+ > > sync+--+ > left/top+--------+ > right/bottom+----------------------------+ > > +-------------------+ > | v i d e o | > +--+ +-----+ +-----+ +---+ > | | | | > +--+ +--+ > sync+-------------------------------+ > left/top+-----+ > right/bottom+-------------------------+ This is a good explanation. Can you add detail that relates the names you use here to to the variable names in your patch (or change them to match)? > > Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> > --- > drivers/media/platform/aspeed-video.c | 27 ++++++++++++++++++++++----- > 1 file changed, 22 insertions(+), 5 deletions(-) > > diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c > index 581a4261f9b7..5ad3a20c5bac 100644 > --- a/drivers/media/platform/aspeed-video.c > +++ b/drivers/media/platform/aspeed-video.c > @@ -988,10 +988,20 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) > src_tb_edge); > video->frame_top = FIELD_GET(VE_SRC_TB_EDGE_DET_TOP, > src_tb_edge); > - det->vfrontporch = video->frame_top; > - det->vbackporch = FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - > - video->frame_bottom; > det->vsync = FIELD_GET(VE_SYNC_STATUS_VSYNC, sync); Would it be clearer if you structured the code like this? vsync = FIELD_GET(VE_SYNC_STATUS_VSYNC, sync); vlines = FIELD_GET(VE_MODE_DETECT_V_LINES, mds); if (det->polarities & V4L2_DV_VSYNC_POS_POL)) { det->vbackporch = video->frame_top - vsync; det->vfrontporch = vlines - video->frame_bottom; det->vsync = vsync; } else { det->vbackporch = video->frame_top; det->vfrontporch = vlines - video->frame_bottom - vsync; det->vsync = vlines - vsync; } > + if (det->polarities & V4L2_DV_VSYNC_POS_POL) { > + det->vbackporch = video->frame_top - det->vsync; > + det->vfrontporch = > + FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - > + video->frame_bottom; > + } else { > + det->vsync = FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - > + det->vsync; > + det->vbackporch = video->frame_top; > + det->vfrontporch = > + FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - > + video->frame_bottom - det->vsync; > + } > if (video->frame_top > video->frame_bottom) > continue; > > @@ -999,9 +1009,16 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) > src_lr_edge); > video->frame_left = FIELD_GET(VE_SRC_LR_EDGE_DET_LEFT, > src_lr_edge); > - det->hfrontporch = video->frame_left; > - det->hbackporch = htotal - video->frame_right; > det->hsync = FIELD_GET(VE_SYNC_STATUS_HSYNC, sync); > + if (det->polarities & V4L2_DV_HSYNC_POS_POL) { > + det->hbackporch = video->frame_left - det->hsync; > + det->hfrontporch = htotal - video->frame_right; > + } else { > + det->hsync = htotal - det->hsync; > + det->hbackporch = video->frame_left; > + det->hfrontporch = htotal - video->frame_right - > + det->hsync; > + } > if (video->frame_left > video->frame_right) > continue; > > -- > 2.25.1 > ^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PATCH 3/4] media: aspeed: Correct values for detected timing @ 2021-12-22 1:31 ` Joel Stanley 0 siblings, 0 replies; 43+ messages in thread From: Joel Stanley @ 2021-12-22 1:31 UTC (permalink / raw) To: Jammy Huang Cc: Eddie James, Mauro Carvalho Chehab, Andrew Jeffery, linux-media, OpenBMC Maillist, Linux ARM, linux-aspeed, Linux Kernel Mailing List On Fri, 17 Dec 2021 at 09:54, Jammy Huang <jammy_huang@aspeedtech.com> wrote: > > Correct timing's fp/sync/bp value based on the information below. > It should be noticed that the calculation formula should be changed > per sync polarity. > > The sequence of signal: sync - backporch - video data - frontporch > > The following registers start counting from sync's rising edge: > 1. VR090: frame edge's left and right > 2. VR094: frame edge's top and bottom > 3. VR09C: counting from sync's rising edge to falling edge > > +--+ +-------------------+ +--+ > | | | v i d e o | | | > +--+ +-----+ +-----+ +---+ > > sync+--+ > left/top+--------+ > right/bottom+----------------------------+ > > +-------------------+ > | v i d e o | > +--+ +-----+ +-----+ +---+ > | | | | > +--+ +--+ > sync+-------------------------------+ > left/top+-----+ > right/bottom+-------------------------+ This is a good explanation. Can you add detail that relates the names you use here to to the variable names in your patch (or change them to match)? > > Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> > --- > drivers/media/platform/aspeed-video.c | 27 ++++++++++++++++++++++----- > 1 file changed, 22 insertions(+), 5 deletions(-) > > diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c > index 581a4261f9b7..5ad3a20c5bac 100644 > --- a/drivers/media/platform/aspeed-video.c > +++ b/drivers/media/platform/aspeed-video.c > @@ -988,10 +988,20 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) > src_tb_edge); > video->frame_top = FIELD_GET(VE_SRC_TB_EDGE_DET_TOP, > src_tb_edge); > - det->vfrontporch = video->frame_top; > - det->vbackporch = FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - > - video->frame_bottom; > det->vsync = FIELD_GET(VE_SYNC_STATUS_VSYNC, sync); Would it be clearer if you structured the code like this? vsync = FIELD_GET(VE_SYNC_STATUS_VSYNC, sync); vlines = FIELD_GET(VE_MODE_DETECT_V_LINES, mds); if (det->polarities & V4L2_DV_VSYNC_POS_POL)) { det->vbackporch = video->frame_top - vsync; det->vfrontporch = vlines - video->frame_bottom; det->vsync = vsync; } else { det->vbackporch = video->frame_top; det->vfrontporch = vlines - video->frame_bottom - vsync; det->vsync = vlines - vsync; } > + if (det->polarities & V4L2_DV_VSYNC_POS_POL) { > + det->vbackporch = video->frame_top - det->vsync; > + det->vfrontporch = > + FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - > + video->frame_bottom; > + } else { > + det->vsync = FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - > + det->vsync; > + det->vbackporch = video->frame_top; > + det->vfrontporch = > + FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - > + video->frame_bottom - det->vsync; > + } > if (video->frame_top > video->frame_bottom) > continue; > > @@ -999,9 +1009,16 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) > src_lr_edge); > video->frame_left = FIELD_GET(VE_SRC_LR_EDGE_DET_LEFT, > src_lr_edge); > - det->hfrontporch = video->frame_left; > - det->hbackporch = htotal - video->frame_right; > det->hsync = FIELD_GET(VE_SYNC_STATUS_HSYNC, sync); > + if (det->polarities & V4L2_DV_HSYNC_POS_POL) { > + det->hbackporch = video->frame_left - det->hsync; > + det->hfrontporch = htotal - video->frame_right; > + } else { > + det->hsync = htotal - det->hsync; > + det->hbackporch = video->frame_left; > + det->hfrontporch = htotal - video->frame_right - > + det->hsync; > + } > if (video->frame_left > video->frame_right) > continue; > > -- > 2.25.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PATCH 3/4] media: aspeed: Correct values for detected timing @ 2021-12-22 1:31 ` Joel Stanley 0 siblings, 0 replies; 43+ messages in thread From: Joel Stanley @ 2021-12-22 1:31 UTC (permalink / raw) To: Jammy Huang Cc: linux-aspeed, Andrew Jeffery, OpenBMC Maillist, Eddie James, Linux Kernel Mailing List, Mauro Carvalho Chehab, Linux ARM, linux-media On Fri, 17 Dec 2021 at 09:54, Jammy Huang <jammy_huang@aspeedtech.com> wrote: > > Correct timing's fp/sync/bp value based on the information below. > It should be noticed that the calculation formula should be changed > per sync polarity. > > The sequence of signal: sync - backporch - video data - frontporch > > The following registers start counting from sync's rising edge: > 1. VR090: frame edge's left and right > 2. VR094: frame edge's top and bottom > 3. VR09C: counting from sync's rising edge to falling edge > > +--+ +-------------------+ +--+ > | | | v i d e o | | | > +--+ +-----+ +-----+ +---+ > > sync+--+ > left/top+--------+ > right/bottom+----------------------------+ > > +-------------------+ > | v i d e o | > +--+ +-----+ +-----+ +---+ > | | | | > +--+ +--+ > sync+-------------------------------+ > left/top+-----+ > right/bottom+-------------------------+ This is a good explanation. Can you add detail that relates the names you use here to to the variable names in your patch (or change them to match)? > > Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> > --- > drivers/media/platform/aspeed-video.c | 27 ++++++++++++++++++++++----- > 1 file changed, 22 insertions(+), 5 deletions(-) > > diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c > index 581a4261f9b7..5ad3a20c5bac 100644 > --- a/drivers/media/platform/aspeed-video.c > +++ b/drivers/media/platform/aspeed-video.c > @@ -988,10 +988,20 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) > src_tb_edge); > video->frame_top = FIELD_GET(VE_SRC_TB_EDGE_DET_TOP, > src_tb_edge); > - det->vfrontporch = video->frame_top; > - det->vbackporch = FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - > - video->frame_bottom; > det->vsync = FIELD_GET(VE_SYNC_STATUS_VSYNC, sync); Would it be clearer if you structured the code like this? vsync = FIELD_GET(VE_SYNC_STATUS_VSYNC, sync); vlines = FIELD_GET(VE_MODE_DETECT_V_LINES, mds); if (det->polarities & V4L2_DV_VSYNC_POS_POL)) { det->vbackporch = video->frame_top - vsync; det->vfrontporch = vlines - video->frame_bottom; det->vsync = vsync; } else { det->vbackporch = video->frame_top; det->vfrontporch = vlines - video->frame_bottom - vsync; det->vsync = vlines - vsync; } > + if (det->polarities & V4L2_DV_VSYNC_POS_POL) { > + det->vbackporch = video->frame_top - det->vsync; > + det->vfrontporch = > + FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - > + video->frame_bottom; > + } else { > + det->vsync = FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - > + det->vsync; > + det->vbackporch = video->frame_top; > + det->vfrontporch = > + FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - > + video->frame_bottom - det->vsync; > + } > if (video->frame_top > video->frame_bottom) > continue; > > @@ -999,9 +1009,16 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) > src_lr_edge); > video->frame_left = FIELD_GET(VE_SRC_LR_EDGE_DET_LEFT, > src_lr_edge); > - det->hfrontporch = video->frame_left; > - det->hbackporch = htotal - video->frame_right; > det->hsync = FIELD_GET(VE_SYNC_STATUS_HSYNC, sync); > + if (det->polarities & V4L2_DV_HSYNC_POS_POL) { > + det->hbackporch = video->frame_left - det->hsync; > + det->hfrontporch = htotal - video->frame_right; > + } else { > + det->hsync = htotal - det->hsync; > + det->hbackporch = video->frame_left; > + det->hfrontporch = htotal - video->frame_right - > + det->hsync; > + } > if (video->frame_left > video->frame_right) > continue; > > -- > 2.25.1 > ^ permalink raw reply [flat|nested] 43+ messages in thread
* [PATCH 3/4] media: aspeed: Correct values for detected timing 2021-12-22 1:31 ` Joel Stanley (?) (?) @ 2021-12-22 6:11 ` Jammy Huang -1 siblings, 0 replies; 43+ messages in thread From: Jammy Huang @ 2021-12-22 6:11 UTC (permalink / raw) To: linux-aspeed Hi Joel, OK, I will update in next patch as you advised. Thanks for your review. On 2021/12/22 ?? 09:31, Joel Stanley wrote: > On Fri, 17 Dec 2021 at 09:54, Jammy Huang <jammy_huang@aspeedtech.com> wrote: >> Correct timing's fp/sync/bp value based on the information below. >> It should be noticed that the calculation formula should be changed >> per sync polarity. >> >> The sequence of signal: sync - backporch - video data - frontporch >> >> The following registers start counting from sync's rising edge: >> 1. VR090: frame edge's left and right >> 2. VR094: frame edge's top and bottom >> 3. VR09C: counting from sync's rising edge to falling edge >> >> +--+ +-------------------+ +--+ >> | | | v i d e o | | | >> +--+ +-----+ +-----+ +---+ >> >> sync+--+ >> left/top+--------+ >> right/bottom+----------------------------+ >> >> +-------------------+ >> | v i d e o | >> +--+ +-----+ +-----+ +---+ >> | | | | >> +--+ +--+ >> sync+-------------------------------+ >> left/top+-----+ >> right/bottom+-------------------------+ > This is a good explanation. Can you add detail that relates the names > you use here to to the variable names in your patch (or change them to > match)? > >> Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> >> --- >> drivers/media/platform/aspeed-video.c | 27 ++++++++++++++++++++++----- >> 1 file changed, 22 insertions(+), 5 deletions(-) >> >> diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c >> index 581a4261f9b7..5ad3a20c5bac 100644 >> --- a/drivers/media/platform/aspeed-video.c >> +++ b/drivers/media/platform/aspeed-video.c >> @@ -988,10 +988,20 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) >> src_tb_edge); >> video->frame_top = FIELD_GET(VE_SRC_TB_EDGE_DET_TOP, >> src_tb_edge); >> - det->vfrontporch = video->frame_top; >> - det->vbackporch = FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - >> - video->frame_bottom; >> det->vsync = FIELD_GET(VE_SYNC_STATUS_VSYNC, sync); > > Would it be clearer if you structured the code like this? > > vsync = FIELD_GET(VE_SYNC_STATUS_VSYNC, sync); > vlines = FIELD_GET(VE_MODE_DETECT_V_LINES, mds); > > if (det->polarities & V4L2_DV_VSYNC_POS_POL)) { > det->vbackporch = video->frame_top - vsync; > det->vfrontporch = vlines - video->frame_bottom; > det->vsync = vsync; > } else { > det->vbackporch = video->frame_top; > det->vfrontporch = vlines - video->frame_bottom - vsync; > det->vsync = vlines - vsync; > > } > > >> + if (det->polarities & V4L2_DV_VSYNC_POS_POL) { >> + det->vbackporch = video->frame_top - det->vsync; >> + det->vfrontporch = >> + FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - >> + video->frame_bottom; >> + } else { >> + det->vsync = FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - >> + det->vsync; >> + det->vbackporch = video->frame_top; >> + det->vfrontporch = >> + FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - >> + video->frame_bottom - det->vsync; >> + } >> if (video->frame_top > video->frame_bottom) >> continue; >> >> @@ -999,9 +1009,16 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) >> src_lr_edge); >> video->frame_left = FIELD_GET(VE_SRC_LR_EDGE_DET_LEFT, >> src_lr_edge); >> - det->hfrontporch = video->frame_left; >> - det->hbackporch = htotal - video->frame_right; >> det->hsync = FIELD_GET(VE_SYNC_STATUS_HSYNC, sync); >> + if (det->polarities & V4L2_DV_HSYNC_POS_POL) { >> + det->hbackporch = video->frame_left - det->hsync; >> + det->hfrontporch = htotal - video->frame_right; >> + } else { >> + det->hsync = htotal - det->hsync; >> + det->hbackporch = video->frame_left; >> + det->hfrontporch = htotal - video->frame_right - >> + det->hsync; >> + } >> if (video->frame_left > video->frame_right) >> continue; >> >> -- >> 2.25.1 >> -- Best Regards Jammy ^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PATCH 3/4] media: aspeed: Correct values for detected timing @ 2021-12-22 6:11 ` Jammy Huang 0 siblings, 0 replies; 43+ messages in thread From: Jammy Huang @ 2021-12-22 6:11 UTC (permalink / raw) To: Joel Stanley Cc: Eddie James, Mauro Carvalho Chehab, Andrew Jeffery, linux-media@vger.kernel.org, OpenBMC Maillist, Linux ARM, linux-aspeed, Linux Kernel Mailing List Hi Joel, OK, I will update in next patch as you advised. Thanks for your review. On 2021/12/22 上午 09:31, Joel Stanley wrote: > On Fri, 17 Dec 2021 at 09:54, Jammy Huang <jammy_huang@aspeedtech.com> wrote: >> Correct timing's fp/sync/bp value based on the information below. >> It should be noticed that the calculation formula should be changed >> per sync polarity. >> >> The sequence of signal: sync - backporch - video data - frontporch >> >> The following registers start counting from sync's rising edge: >> 1. VR090: frame edge's left and right >> 2. VR094: frame edge's top and bottom >> 3. VR09C: counting from sync's rising edge to falling edge >> >> +--+ +-------------------+ +--+ >> | | | v i d e o | | | >> +--+ +-----+ +-----+ +---+ >> >> sync+--+ >> left/top+--------+ >> right/bottom+----------------------------+ >> >> +-------------------+ >> | v i d e o | >> +--+ +-----+ +-----+ +---+ >> | | | | >> +--+ +--+ >> sync+-------------------------------+ >> left/top+-----+ >> right/bottom+-------------------------+ > This is a good explanation. Can you add detail that relates the names > you use here to to the variable names in your patch (or change them to > match)? > >> Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> >> --- >> drivers/media/platform/aspeed-video.c | 27 ++++++++++++++++++++++----- >> 1 file changed, 22 insertions(+), 5 deletions(-) >> >> diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c >> index 581a4261f9b7..5ad3a20c5bac 100644 >> --- a/drivers/media/platform/aspeed-video.c >> +++ b/drivers/media/platform/aspeed-video.c >> @@ -988,10 +988,20 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) >> src_tb_edge); >> video->frame_top = FIELD_GET(VE_SRC_TB_EDGE_DET_TOP, >> src_tb_edge); >> - det->vfrontporch = video->frame_top; >> - det->vbackporch = FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - >> - video->frame_bottom; >> det->vsync = FIELD_GET(VE_SYNC_STATUS_VSYNC, sync); > > Would it be clearer if you structured the code like this? > > vsync = FIELD_GET(VE_SYNC_STATUS_VSYNC, sync); > vlines = FIELD_GET(VE_MODE_DETECT_V_LINES, mds); > > if (det->polarities & V4L2_DV_VSYNC_POS_POL)) { > det->vbackporch = video->frame_top - vsync; > det->vfrontporch = vlines - video->frame_bottom; > det->vsync = vsync; > } else { > det->vbackporch = video->frame_top; > det->vfrontporch = vlines - video->frame_bottom - vsync; > det->vsync = vlines - vsync; > > } > > >> + if (det->polarities & V4L2_DV_VSYNC_POS_POL) { >> + det->vbackporch = video->frame_top - det->vsync; >> + det->vfrontporch = >> + FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - >> + video->frame_bottom; >> + } else { >> + det->vsync = FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - >> + det->vsync; >> + det->vbackporch = video->frame_top; >> + det->vfrontporch = >> + FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - >> + video->frame_bottom - det->vsync; >> + } >> if (video->frame_top > video->frame_bottom) >> continue; >> >> @@ -999,9 +1009,16 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) >> src_lr_edge); >> video->frame_left = FIELD_GET(VE_SRC_LR_EDGE_DET_LEFT, >> src_lr_edge); >> - det->hfrontporch = video->frame_left; >> - det->hbackporch = htotal - video->frame_right; >> det->hsync = FIELD_GET(VE_SYNC_STATUS_HSYNC, sync); >> + if (det->polarities & V4L2_DV_HSYNC_POS_POL) { >> + det->hbackporch = video->frame_left - det->hsync; >> + det->hfrontporch = htotal - video->frame_right; >> + } else { >> + det->hsync = htotal - det->hsync; >> + det->hbackporch = video->frame_left; >> + det->hfrontporch = htotal - video->frame_right - >> + det->hsync; >> + } >> if (video->frame_left > video->frame_right) >> continue; >> >> -- >> 2.25.1 >> -- Best Regards Jammy ^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PATCH 3/4] media: aspeed: Correct values for detected timing @ 2021-12-22 6:11 ` Jammy Huang 0 siblings, 0 replies; 43+ messages in thread From: Jammy Huang @ 2021-12-22 6:11 UTC (permalink / raw) To: Joel Stanley Cc: Eddie James, Mauro Carvalho Chehab, Andrew Jeffery, linux-media@vger.kernel.org, OpenBMC Maillist, Linux ARM, linux-aspeed, Linux Kernel Mailing List Hi Joel, OK, I will update in next patch as you advised. Thanks for your review. On 2021/12/22 上午 09:31, Joel Stanley wrote: > On Fri, 17 Dec 2021 at 09:54, Jammy Huang <jammy_huang@aspeedtech.com> wrote: >> Correct timing's fp/sync/bp value based on the information below. >> It should be noticed that the calculation formula should be changed >> per sync polarity. >> >> The sequence of signal: sync - backporch - video data - frontporch >> >> The following registers start counting from sync's rising edge: >> 1. VR090: frame edge's left and right >> 2. VR094: frame edge's top and bottom >> 3. VR09C: counting from sync's rising edge to falling edge >> >> +--+ +-------------------+ +--+ >> | | | v i d e o | | | >> +--+ +-----+ +-----+ +---+ >> >> sync+--+ >> left/top+--------+ >> right/bottom+----------------------------+ >> >> +-------------------+ >> | v i d e o | >> +--+ +-----+ +-----+ +---+ >> | | | | >> +--+ +--+ >> sync+-------------------------------+ >> left/top+-----+ >> right/bottom+-------------------------+ > This is a good explanation. Can you add detail that relates the names > you use here to to the variable names in your patch (or change them to > match)? > >> Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> >> --- >> drivers/media/platform/aspeed-video.c | 27 ++++++++++++++++++++++----- >> 1 file changed, 22 insertions(+), 5 deletions(-) >> >> diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c >> index 581a4261f9b7..5ad3a20c5bac 100644 >> --- a/drivers/media/platform/aspeed-video.c >> +++ b/drivers/media/platform/aspeed-video.c >> @@ -988,10 +988,20 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) >> src_tb_edge); >> video->frame_top = FIELD_GET(VE_SRC_TB_EDGE_DET_TOP, >> src_tb_edge); >> - det->vfrontporch = video->frame_top; >> - det->vbackporch = FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - >> - video->frame_bottom; >> det->vsync = FIELD_GET(VE_SYNC_STATUS_VSYNC, sync); > > Would it be clearer if you structured the code like this? > > vsync = FIELD_GET(VE_SYNC_STATUS_VSYNC, sync); > vlines = FIELD_GET(VE_MODE_DETECT_V_LINES, mds); > > if (det->polarities & V4L2_DV_VSYNC_POS_POL)) { > det->vbackporch = video->frame_top - vsync; > det->vfrontporch = vlines - video->frame_bottom; > det->vsync = vsync; > } else { > det->vbackporch = video->frame_top; > det->vfrontporch = vlines - video->frame_bottom - vsync; > det->vsync = vlines - vsync; > > } > > >> + if (det->polarities & V4L2_DV_VSYNC_POS_POL) { >> + det->vbackporch = video->frame_top - det->vsync; >> + det->vfrontporch = >> + FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - >> + video->frame_bottom; >> + } else { >> + det->vsync = FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - >> + det->vsync; >> + det->vbackporch = video->frame_top; >> + det->vfrontporch = >> + FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - >> + video->frame_bottom - det->vsync; >> + } >> if (video->frame_top > video->frame_bottom) >> continue; >> >> @@ -999,9 +1009,16 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) >> src_lr_edge); >> video->frame_left = FIELD_GET(VE_SRC_LR_EDGE_DET_LEFT, >> src_lr_edge); >> - det->hfrontporch = video->frame_left; >> - det->hbackporch = htotal - video->frame_right; >> det->hsync = FIELD_GET(VE_SYNC_STATUS_HSYNC, sync); >> + if (det->polarities & V4L2_DV_HSYNC_POS_POL) { >> + det->hbackporch = video->frame_left - det->hsync; >> + det->hfrontporch = htotal - video->frame_right; >> + } else { >> + det->hsync = htotal - det->hsync; >> + det->hbackporch = video->frame_left; >> + det->hfrontporch = htotal - video->frame_right - >> + det->hsync; >> + } >> if (video->frame_left > video->frame_right) >> continue; >> >> -- >> 2.25.1 >> -- Best Regards Jammy _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PATCH 3/4] media: aspeed: Correct values for detected timing @ 2021-12-22 6:11 ` Jammy Huang 0 siblings, 0 replies; 43+ messages in thread From: Jammy Huang @ 2021-12-22 6:11 UTC (permalink / raw) To: Joel Stanley Cc: linux-aspeed, Andrew Jeffery, OpenBMC Maillist, Eddie James, Linux Kernel Mailing List, Mauro Carvalho Chehab, Linux ARM, linux-media@vger.kernel.org Hi Joel, OK, I will update in next patch as you advised. Thanks for your review. On 2021/12/22 上午 09:31, Joel Stanley wrote: > On Fri, 17 Dec 2021 at 09:54, Jammy Huang <jammy_huang@aspeedtech.com> wrote: >> Correct timing's fp/sync/bp value based on the information below. >> It should be noticed that the calculation formula should be changed >> per sync polarity. >> >> The sequence of signal: sync - backporch - video data - frontporch >> >> The following registers start counting from sync's rising edge: >> 1. VR090: frame edge's left and right >> 2. VR094: frame edge's top and bottom >> 3. VR09C: counting from sync's rising edge to falling edge >> >> +--+ +-------------------+ +--+ >> | | | v i d e o | | | >> +--+ +-----+ +-----+ +---+ >> >> sync+--+ >> left/top+--------+ >> right/bottom+----------------------------+ >> >> +-------------------+ >> | v i d e o | >> +--+ +-----+ +-----+ +---+ >> | | | | >> +--+ +--+ >> sync+-------------------------------+ >> left/top+-----+ >> right/bottom+-------------------------+ > This is a good explanation. Can you add detail that relates the names > you use here to to the variable names in your patch (or change them to > match)? > >> Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> >> --- >> drivers/media/platform/aspeed-video.c | 27 ++++++++++++++++++++++----- >> 1 file changed, 22 insertions(+), 5 deletions(-) >> >> diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c >> index 581a4261f9b7..5ad3a20c5bac 100644 >> --- a/drivers/media/platform/aspeed-video.c >> +++ b/drivers/media/platform/aspeed-video.c >> @@ -988,10 +988,20 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) >> src_tb_edge); >> video->frame_top = FIELD_GET(VE_SRC_TB_EDGE_DET_TOP, >> src_tb_edge); >> - det->vfrontporch = video->frame_top; >> - det->vbackporch = FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - >> - video->frame_bottom; >> det->vsync = FIELD_GET(VE_SYNC_STATUS_VSYNC, sync); > > Would it be clearer if you structured the code like this? > > vsync = FIELD_GET(VE_SYNC_STATUS_VSYNC, sync); > vlines = FIELD_GET(VE_MODE_DETECT_V_LINES, mds); > > if (det->polarities & V4L2_DV_VSYNC_POS_POL)) { > det->vbackporch = video->frame_top - vsync; > det->vfrontporch = vlines - video->frame_bottom; > det->vsync = vsync; > } else { > det->vbackporch = video->frame_top; > det->vfrontporch = vlines - video->frame_bottom - vsync; > det->vsync = vlines - vsync; > > } > > >> + if (det->polarities & V4L2_DV_VSYNC_POS_POL) { >> + det->vbackporch = video->frame_top - det->vsync; >> + det->vfrontporch = >> + FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - >> + video->frame_bottom; >> + } else { >> + det->vsync = FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - >> + det->vsync; >> + det->vbackporch = video->frame_top; >> + det->vfrontporch = >> + FIELD_GET(VE_MODE_DETECT_V_LINES, mds) - >> + video->frame_bottom - det->vsync; >> + } >> if (video->frame_top > video->frame_bottom) >> continue; >> >> @@ -999,9 +1009,16 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) >> src_lr_edge); >> video->frame_left = FIELD_GET(VE_SRC_LR_EDGE_DET_LEFT, >> src_lr_edge); >> - det->hfrontporch = video->frame_left; >> - det->hbackporch = htotal - video->frame_right; >> det->hsync = FIELD_GET(VE_SYNC_STATUS_HSYNC, sync); >> + if (det->polarities & V4L2_DV_HSYNC_POS_POL) { >> + det->hbackporch = video->frame_left - det->hsync; >> + det->hfrontporch = htotal - video->frame_right; >> + } else { >> + det->hsync = htotal - det->hsync; >> + det->hbackporch = video->frame_left; >> + det->hfrontporch = htotal - video->frame_right - >> + det->hsync; >> + } >> if (video->frame_left > video->frame_right) >> continue; >> >> -- >> 2.25.1 >> -- Best Regards Jammy ^ permalink raw reply [flat|nested] 43+ messages in thread
* [PATCH 4/4] media: aspeed: Fix timing polarity incorrect 2021-12-17 9:53 ` Jammy Huang (?) @ 2021-12-17 9:54 ` Jammy Huang -1 siblings, 0 replies; 43+ messages in thread From: Jammy Huang @ 2021-12-17 9:54 UTC (permalink / raw) To: linux-aspeed This is a workaround for polarity unstable. Sync value get by VR09C counts from sync's rising edge, which means sync's polarity is negative if sync value is bigger than total/2. Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> --- drivers/media/platform/aspeed-video.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c index 5ad3a20c5bac..f628f69bb7dd 100644 --- a/drivers/media/platform/aspeed-video.c +++ b/drivers/media/platform/aspeed-video.c @@ -989,6 +989,15 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) video->frame_top = FIELD_GET(VE_SRC_TB_EDGE_DET_TOP, src_tb_edge); det->vsync = FIELD_GET(VE_SYNC_STATUS_VSYNC, sync); + /* + * Workaround for polarity detection + * Use sync(VR098) counts from sync's rising edge till falling + * edge to tell sync polarity. + */ + if (det->vsync > (FIELD_GET(VE_MODE_DETECT_V_LINES, mds) >> 1)) + det->polarities &= ~V4L2_DV_VSYNC_POS_POL; + else + det->polarities |= V4L2_DV_VSYNC_POS_POL; if (det->polarities & V4L2_DV_VSYNC_POS_POL) { det->vbackporch = video->frame_top - det->vsync; det->vfrontporch = @@ -1010,6 +1019,15 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) video->frame_left = FIELD_GET(VE_SRC_LR_EDGE_DET_LEFT, src_lr_edge); det->hsync = FIELD_GET(VE_SYNC_STATUS_HSYNC, sync); + /* + * Workaround for polarity detection + * Use sync(VR098) counts from sync's rising edge till falling + * edge to tell sync polarity. + */ + if (det->hsync > (htotal >> 1)) + det->polarities &= ~V4L2_DV_HSYNC_POS_POL; + else + det->polarities |= V4L2_DV_HSYNC_POS_POL; if (det->polarities & V4L2_DV_HSYNC_POS_POL) { det->hbackporch = video->frame_left - det->hsync; det->hfrontporch = htotal - video->frame_right; -- 2.25.1 ^ permalink raw reply related [flat|nested] 43+ messages in thread
* [PATCH 4/4] media: aspeed: Fix timing polarity incorrect @ 2021-12-17 9:54 ` Jammy Huang 0 siblings, 0 replies; 43+ messages in thread From: Jammy Huang @ 2021-12-17 9:54 UTC (permalink / raw) To: eajames, mchehab, joel, andrew, linux-media, openbmc, linux-arm-kernel, linux-aspeed, linux-kernel This is a workaround for polarity unstable. Sync value get by VR09C counts from sync's rising edge, which means sync's polarity is negative if sync value is bigger than total/2. Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> --- drivers/media/platform/aspeed-video.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c index 5ad3a20c5bac..f628f69bb7dd 100644 --- a/drivers/media/platform/aspeed-video.c +++ b/drivers/media/platform/aspeed-video.c @@ -989,6 +989,15 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) video->frame_top = FIELD_GET(VE_SRC_TB_EDGE_DET_TOP, src_tb_edge); det->vsync = FIELD_GET(VE_SYNC_STATUS_VSYNC, sync); + /* + * Workaround for polarity detection + * Use sync(VR098) counts from sync's rising edge till falling + * edge to tell sync polarity. + */ + if (det->vsync > (FIELD_GET(VE_MODE_DETECT_V_LINES, mds) >> 1)) + det->polarities &= ~V4L2_DV_VSYNC_POS_POL; + else + det->polarities |= V4L2_DV_VSYNC_POS_POL; if (det->polarities & V4L2_DV_VSYNC_POS_POL) { det->vbackporch = video->frame_top - det->vsync; det->vfrontporch = @@ -1010,6 +1019,15 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) video->frame_left = FIELD_GET(VE_SRC_LR_EDGE_DET_LEFT, src_lr_edge); det->hsync = FIELD_GET(VE_SYNC_STATUS_HSYNC, sync); + /* + * Workaround for polarity detection + * Use sync(VR098) counts from sync's rising edge till falling + * edge to tell sync polarity. + */ + if (det->hsync > (htotal >> 1)) + det->polarities &= ~V4L2_DV_HSYNC_POS_POL; + else + det->polarities |= V4L2_DV_HSYNC_POS_POL; if (det->polarities & V4L2_DV_HSYNC_POS_POL) { det->hbackporch = video->frame_left - det->hsync; det->hfrontporch = htotal - video->frame_right; -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 43+ messages in thread
* [PATCH 4/4] media: aspeed: Fix timing polarity incorrect @ 2021-12-17 9:54 ` Jammy Huang 0 siblings, 0 replies; 43+ messages in thread From: Jammy Huang @ 2021-12-17 9:54 UTC (permalink / raw) To: eajames, mchehab, joel, andrew, linux-media, openbmc, linux-arm-kernel, linux-aspeed, linux-kernel This is a workaround for polarity unstable. Sync value get by VR09C counts from sync's rising edge, which means sync's polarity is negative if sync value is bigger than total/2. Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> --- drivers/media/platform/aspeed-video.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c index 5ad3a20c5bac..f628f69bb7dd 100644 --- a/drivers/media/platform/aspeed-video.c +++ b/drivers/media/platform/aspeed-video.c @@ -989,6 +989,15 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) video->frame_top = FIELD_GET(VE_SRC_TB_EDGE_DET_TOP, src_tb_edge); det->vsync = FIELD_GET(VE_SYNC_STATUS_VSYNC, sync); + /* + * Workaround for polarity detection + * Use sync(VR098) counts from sync's rising edge till falling + * edge to tell sync polarity. + */ + if (det->vsync > (FIELD_GET(VE_MODE_DETECT_V_LINES, mds) >> 1)) + det->polarities &= ~V4L2_DV_VSYNC_POS_POL; + else + det->polarities |= V4L2_DV_VSYNC_POS_POL; if (det->polarities & V4L2_DV_VSYNC_POS_POL) { det->vbackporch = video->frame_top - det->vsync; det->vfrontporch = @@ -1010,6 +1019,15 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) video->frame_left = FIELD_GET(VE_SRC_LR_EDGE_DET_LEFT, src_lr_edge); det->hsync = FIELD_GET(VE_SYNC_STATUS_HSYNC, sync); + /* + * Workaround for polarity detection + * Use sync(VR098) counts from sync's rising edge till falling + * edge to tell sync polarity. + */ + if (det->hsync > (htotal >> 1)) + det->polarities &= ~V4L2_DV_HSYNC_POS_POL; + else + det->polarities |= V4L2_DV_HSYNC_POS_POL; if (det->polarities & V4L2_DV_HSYNC_POS_POL) { det->hbackporch = video->frame_left - det->hsync; det->hfrontporch = htotal - video->frame_right; -- 2.25.1 ^ permalink raw reply related [flat|nested] 43+ messages in thread
* [PATCH 4/4] media: aspeed: Fix timing polarity incorrect 2021-12-17 9:54 ` Jammy Huang (?) (?) @ 2021-12-22 1:22 ` Joel Stanley -1 siblings, 0 replies; 43+ messages in thread From: Joel Stanley @ 2021-12-22 1:22 UTC (permalink / raw) To: linux-aspeed On Fri, 17 Dec 2021 at 09:54, Jammy Huang <jammy_huang@aspeedtech.com> wrote: > > This is a workaround for polarity unstable. > Sync value get by VR09C counts from sync's rising edge, which means > sync's polarity is negative if sync value is bigger than total/2. > > Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> > --- > drivers/media/platform/aspeed-video.c | 18 ++++++++++++++++++ > 1 file changed, 18 insertions(+) > > diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c > index 5ad3a20c5bac..f628f69bb7dd 100644 > --- a/drivers/media/platform/aspeed-video.c > +++ b/drivers/media/platform/aspeed-video.c > @@ -989,6 +989,15 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) > video->frame_top = FIELD_GET(VE_SRC_TB_EDGE_DET_TOP, > src_tb_edge); > det->vsync = FIELD_GET(VE_SYNC_STATUS_VSYNC, sync); > + /* > + * Workaround for polarity detection > + * Use sync(VR098) counts from sync's rising edge till falling > + * edge to tell sync polarity. > + */ > + if (det->vsync > (FIELD_GET(VE_MODE_DETECT_V_LINES, mds) >> 1)) Are you right shifting as this is the value / 2? I think it's clearer to write / 2 instead of >> 1. Mention in the comment that this is a workaround for when the sync value is larger than half. > + det->polarities &= ~V4L2_DV_VSYNC_POS_POL; > + else > + det->polarities |= V4L2_DV_VSYNC_POS_POL; > if (det->polarities & V4L2_DV_VSYNC_POS_POL) { > det->vbackporch = video->frame_top - det->vsync; > det->vfrontporch = > @@ -1010,6 +1019,15 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) > video->frame_left = FIELD_GET(VE_SRC_LR_EDGE_DET_LEFT, > src_lr_edge); > det->hsync = FIELD_GET(VE_SYNC_STATUS_HSYNC, sync); > + /* > + * Workaround for polarity detection > + * Use sync(VR098) counts from sync's rising edge till falling > + * edge to tell sync polarity. > + */ > + if (det->hsync > (htotal >> 1)) > + det->polarities &= ~V4L2_DV_HSYNC_POS_POL; > + else > + det->polarities |= V4L2_DV_HSYNC_POS_POL; > if (det->polarities & V4L2_DV_HSYNC_POS_POL) { > det->hbackporch = video->frame_left - det->hsync; > det->hfrontporch = htotal - video->frame_right; > -- > 2.25.1 > ^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PATCH 4/4] media: aspeed: Fix timing polarity incorrect @ 2021-12-22 1:22 ` Joel Stanley 0 siblings, 0 replies; 43+ messages in thread From: Joel Stanley @ 2021-12-22 1:22 UTC (permalink / raw) To: Jammy Huang Cc: Eddie James, Mauro Carvalho Chehab, Andrew Jeffery, linux-media, OpenBMC Maillist, Linux ARM, linux-aspeed, Linux Kernel Mailing List On Fri, 17 Dec 2021 at 09:54, Jammy Huang <jammy_huang@aspeedtech.com> wrote: > > This is a workaround for polarity unstable. > Sync value get by VR09C counts from sync's rising edge, which means > sync's polarity is negative if sync value is bigger than total/2. > > Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> > --- > drivers/media/platform/aspeed-video.c | 18 ++++++++++++++++++ > 1 file changed, 18 insertions(+) > > diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c > index 5ad3a20c5bac..f628f69bb7dd 100644 > --- a/drivers/media/platform/aspeed-video.c > +++ b/drivers/media/platform/aspeed-video.c > @@ -989,6 +989,15 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) > video->frame_top = FIELD_GET(VE_SRC_TB_EDGE_DET_TOP, > src_tb_edge); > det->vsync = FIELD_GET(VE_SYNC_STATUS_VSYNC, sync); > + /* > + * Workaround for polarity detection > + * Use sync(VR098) counts from sync's rising edge till falling > + * edge to tell sync polarity. > + */ > + if (det->vsync > (FIELD_GET(VE_MODE_DETECT_V_LINES, mds) >> 1)) Are you right shifting as this is the value / 2? I think it's clearer to write / 2 instead of >> 1. Mention in the comment that this is a workaround for when the sync value is larger than half. > + det->polarities &= ~V4L2_DV_VSYNC_POS_POL; > + else > + det->polarities |= V4L2_DV_VSYNC_POS_POL; > if (det->polarities & V4L2_DV_VSYNC_POS_POL) { > det->vbackporch = video->frame_top - det->vsync; > det->vfrontporch = > @@ -1010,6 +1019,15 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) > video->frame_left = FIELD_GET(VE_SRC_LR_EDGE_DET_LEFT, > src_lr_edge); > det->hsync = FIELD_GET(VE_SYNC_STATUS_HSYNC, sync); > + /* > + * Workaround for polarity detection > + * Use sync(VR098) counts from sync's rising edge till falling > + * edge to tell sync polarity. > + */ > + if (det->hsync > (htotal >> 1)) > + det->polarities &= ~V4L2_DV_HSYNC_POS_POL; > + else > + det->polarities |= V4L2_DV_HSYNC_POS_POL; > if (det->polarities & V4L2_DV_HSYNC_POS_POL) { > det->hbackporch = video->frame_left - det->hsync; > det->hfrontporch = htotal - video->frame_right; > -- > 2.25.1 > ^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PATCH 4/4] media: aspeed: Fix timing polarity incorrect @ 2021-12-22 1:22 ` Joel Stanley 0 siblings, 0 replies; 43+ messages in thread From: Joel Stanley @ 2021-12-22 1:22 UTC (permalink / raw) To: Jammy Huang Cc: Eddie James, Mauro Carvalho Chehab, Andrew Jeffery, linux-media, OpenBMC Maillist, Linux ARM, linux-aspeed, Linux Kernel Mailing List On Fri, 17 Dec 2021 at 09:54, Jammy Huang <jammy_huang@aspeedtech.com> wrote: > > This is a workaround for polarity unstable. > Sync value get by VR09C counts from sync's rising edge, which means > sync's polarity is negative if sync value is bigger than total/2. > > Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> > --- > drivers/media/platform/aspeed-video.c | 18 ++++++++++++++++++ > 1 file changed, 18 insertions(+) > > diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c > index 5ad3a20c5bac..f628f69bb7dd 100644 > --- a/drivers/media/platform/aspeed-video.c > +++ b/drivers/media/platform/aspeed-video.c > @@ -989,6 +989,15 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) > video->frame_top = FIELD_GET(VE_SRC_TB_EDGE_DET_TOP, > src_tb_edge); > det->vsync = FIELD_GET(VE_SYNC_STATUS_VSYNC, sync); > + /* > + * Workaround for polarity detection > + * Use sync(VR098) counts from sync's rising edge till falling > + * edge to tell sync polarity. > + */ > + if (det->vsync > (FIELD_GET(VE_MODE_DETECT_V_LINES, mds) >> 1)) Are you right shifting as this is the value / 2? I think it's clearer to write / 2 instead of >> 1. Mention in the comment that this is a workaround for when the sync value is larger than half. > + det->polarities &= ~V4L2_DV_VSYNC_POS_POL; > + else > + det->polarities |= V4L2_DV_VSYNC_POS_POL; > if (det->polarities & V4L2_DV_VSYNC_POS_POL) { > det->vbackporch = video->frame_top - det->vsync; > det->vfrontporch = > @@ -1010,6 +1019,15 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) > video->frame_left = FIELD_GET(VE_SRC_LR_EDGE_DET_LEFT, > src_lr_edge); > det->hsync = FIELD_GET(VE_SYNC_STATUS_HSYNC, sync); > + /* > + * Workaround for polarity detection > + * Use sync(VR098) counts from sync's rising edge till falling > + * edge to tell sync polarity. > + */ > + if (det->hsync > (htotal >> 1)) > + det->polarities &= ~V4L2_DV_HSYNC_POS_POL; > + else > + det->polarities |= V4L2_DV_HSYNC_POS_POL; > if (det->polarities & V4L2_DV_HSYNC_POS_POL) { > det->hbackporch = video->frame_left - det->hsync; > det->hfrontporch = htotal - video->frame_right; > -- > 2.25.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PATCH 4/4] media: aspeed: Fix timing polarity incorrect @ 2021-12-22 1:22 ` Joel Stanley 0 siblings, 0 replies; 43+ messages in thread From: Joel Stanley @ 2021-12-22 1:22 UTC (permalink / raw) To: Jammy Huang Cc: linux-aspeed, Andrew Jeffery, OpenBMC Maillist, Eddie James, Linux Kernel Mailing List, Mauro Carvalho Chehab, Linux ARM, linux-media On Fri, 17 Dec 2021 at 09:54, Jammy Huang <jammy_huang@aspeedtech.com> wrote: > > This is a workaround for polarity unstable. > Sync value get by VR09C counts from sync's rising edge, which means > sync's polarity is negative if sync value is bigger than total/2. > > Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> > --- > drivers/media/platform/aspeed-video.c | 18 ++++++++++++++++++ > 1 file changed, 18 insertions(+) > > diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c > index 5ad3a20c5bac..f628f69bb7dd 100644 > --- a/drivers/media/platform/aspeed-video.c > +++ b/drivers/media/platform/aspeed-video.c > @@ -989,6 +989,15 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) > video->frame_top = FIELD_GET(VE_SRC_TB_EDGE_DET_TOP, > src_tb_edge); > det->vsync = FIELD_GET(VE_SYNC_STATUS_VSYNC, sync); > + /* > + * Workaround for polarity detection > + * Use sync(VR098) counts from sync's rising edge till falling > + * edge to tell sync polarity. > + */ > + if (det->vsync > (FIELD_GET(VE_MODE_DETECT_V_LINES, mds) >> 1)) Are you right shifting as this is the value / 2? I think it's clearer to write / 2 instead of >> 1. Mention in the comment that this is a workaround for when the sync value is larger than half. > + det->polarities &= ~V4L2_DV_VSYNC_POS_POL; > + else > + det->polarities |= V4L2_DV_VSYNC_POS_POL; > if (det->polarities & V4L2_DV_VSYNC_POS_POL) { > det->vbackporch = video->frame_top - det->vsync; > det->vfrontporch = > @@ -1010,6 +1019,15 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) > video->frame_left = FIELD_GET(VE_SRC_LR_EDGE_DET_LEFT, > src_lr_edge); > det->hsync = FIELD_GET(VE_SYNC_STATUS_HSYNC, sync); > + /* > + * Workaround for polarity detection > + * Use sync(VR098) counts from sync's rising edge till falling > + * edge to tell sync polarity. > + */ > + if (det->hsync > (htotal >> 1)) > + det->polarities &= ~V4L2_DV_HSYNC_POS_POL; > + else > + det->polarities |= V4L2_DV_HSYNC_POS_POL; > if (det->polarities & V4L2_DV_HSYNC_POS_POL) { > det->hbackporch = video->frame_left - det->hsync; > det->hfrontporch = htotal - video->frame_right; > -- > 2.25.1 > ^ permalink raw reply [flat|nested] 43+ messages in thread
* [PATCH 4/4] media: aspeed: Fix timing polarity incorrect 2021-12-22 1:22 ` Joel Stanley (?) (?) @ 2021-12-22 6:10 ` Jammy Huang -1 siblings, 0 replies; 43+ messages in thread From: Jammy Huang @ 2021-12-22 6:10 UTC (permalink / raw) To: linux-aspeed Hi Joel, OK, I will update in next patch as you advised. Thanks for your review. On 2021/12/22 ?? 09:22, Joel Stanley wrote: > On Fri, 17 Dec 2021 at 09:54, Jammy Huang <jammy_huang@aspeedtech.com> wrote: >> This is a workaround for polarity unstable. >> Sync value get by VR09C counts from sync's rising edge, which means >> sync's polarity is negative if sync value is bigger than total/2. >> >> Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> >> --- >> drivers/media/platform/aspeed-video.c | 18 ++++++++++++++++++ >> 1 file changed, 18 insertions(+) >> >> diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c >> index 5ad3a20c5bac..f628f69bb7dd 100644 >> --- a/drivers/media/platform/aspeed-video.c >> +++ b/drivers/media/platform/aspeed-video.c >> @@ -989,6 +989,15 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) >> video->frame_top = FIELD_GET(VE_SRC_TB_EDGE_DET_TOP, >> src_tb_edge); >> det->vsync = FIELD_GET(VE_SYNC_STATUS_VSYNC, sync); >> + /* >> + * Workaround for polarity detection >> + * Use sync(VR098) counts from sync's rising edge till falling >> + * edge to tell sync polarity. >> + */ >> + if (det->vsync > (FIELD_GET(VE_MODE_DETECT_V_LINES, mds) >> 1)) > Are you right shifting as this is the value / 2? I think it's clearer > to write / 2 instead of >> 1. > > Mention in the comment that this is a workaround for when the sync > value is larger than half. > >> + det->polarities &= ~V4L2_DV_VSYNC_POS_POL; >> + else >> + det->polarities |= V4L2_DV_VSYNC_POS_POL; >> if (det->polarities & V4L2_DV_VSYNC_POS_POL) { >> det->vbackporch = video->frame_top - det->vsync; >> det->vfrontporch = >> @@ -1010,6 +1019,15 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) >> video->frame_left = FIELD_GET(VE_SRC_LR_EDGE_DET_LEFT, >> src_lr_edge); >> det->hsync = FIELD_GET(VE_SYNC_STATUS_HSYNC, sync); >> + /* >> + * Workaround for polarity detection >> + * Use sync(VR098) counts from sync's rising edge till falling >> + * edge to tell sync polarity. >> + */ >> + if (det->hsync > (htotal >> 1)) >> + det->polarities &= ~V4L2_DV_HSYNC_POS_POL; >> + else >> + det->polarities |= V4L2_DV_HSYNC_POS_POL; >> if (det->polarities & V4L2_DV_HSYNC_POS_POL) { >> det->hbackporch = video->frame_left - det->hsync; >> det->hfrontporch = htotal - video->frame_right; >> -- >> 2.25.1 >> -- Best Regards Jammy ^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PATCH 4/4] media: aspeed: Fix timing polarity incorrect @ 2021-12-22 6:10 ` Jammy Huang 0 siblings, 0 replies; 43+ messages in thread From: Jammy Huang @ 2021-12-22 6:10 UTC (permalink / raw) To: Joel Stanley Cc: Eddie James, Mauro Carvalho Chehab, Andrew Jeffery, linux-media@vger.kernel.org, OpenBMC Maillist, Linux ARM, linux-aspeed, Linux Kernel Mailing List Hi Joel, OK, I will update in next patch as you advised. Thanks for your review. On 2021/12/22 上午 09:22, Joel Stanley wrote: > On Fri, 17 Dec 2021 at 09:54, Jammy Huang <jammy_huang@aspeedtech.com> wrote: >> This is a workaround for polarity unstable. >> Sync value get by VR09C counts from sync's rising edge, which means >> sync's polarity is negative if sync value is bigger than total/2. >> >> Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> >> --- >> drivers/media/platform/aspeed-video.c | 18 ++++++++++++++++++ >> 1 file changed, 18 insertions(+) >> >> diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c >> index 5ad3a20c5bac..f628f69bb7dd 100644 >> --- a/drivers/media/platform/aspeed-video.c >> +++ b/drivers/media/platform/aspeed-video.c >> @@ -989,6 +989,15 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) >> video->frame_top = FIELD_GET(VE_SRC_TB_EDGE_DET_TOP, >> src_tb_edge); >> det->vsync = FIELD_GET(VE_SYNC_STATUS_VSYNC, sync); >> + /* >> + * Workaround for polarity detection >> + * Use sync(VR098) counts from sync's rising edge till falling >> + * edge to tell sync polarity. >> + */ >> + if (det->vsync > (FIELD_GET(VE_MODE_DETECT_V_LINES, mds) >> 1)) > Are you right shifting as this is the value / 2? I think it's clearer > to write / 2 instead of >> 1. > > Mention in the comment that this is a workaround for when the sync > value is larger than half. > >> + det->polarities &= ~V4L2_DV_VSYNC_POS_POL; >> + else >> + det->polarities |= V4L2_DV_VSYNC_POS_POL; >> if (det->polarities & V4L2_DV_VSYNC_POS_POL) { >> det->vbackporch = video->frame_top - det->vsync; >> det->vfrontporch = >> @@ -1010,6 +1019,15 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) >> video->frame_left = FIELD_GET(VE_SRC_LR_EDGE_DET_LEFT, >> src_lr_edge); >> det->hsync = FIELD_GET(VE_SYNC_STATUS_HSYNC, sync); >> + /* >> + * Workaround for polarity detection >> + * Use sync(VR098) counts from sync's rising edge till falling >> + * edge to tell sync polarity. >> + */ >> + if (det->hsync > (htotal >> 1)) >> + det->polarities &= ~V4L2_DV_HSYNC_POS_POL; >> + else >> + det->polarities |= V4L2_DV_HSYNC_POS_POL; >> if (det->polarities & V4L2_DV_HSYNC_POS_POL) { >> det->hbackporch = video->frame_left - det->hsync; >> det->hfrontporch = htotal - video->frame_right; >> -- >> 2.25.1 >> -- Best Regards Jammy ^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PATCH 4/4] media: aspeed: Fix timing polarity incorrect @ 2021-12-22 6:10 ` Jammy Huang 0 siblings, 0 replies; 43+ messages in thread From: Jammy Huang @ 2021-12-22 6:10 UTC (permalink / raw) To: Joel Stanley Cc: Eddie James, Mauro Carvalho Chehab, Andrew Jeffery, linux-media@vger.kernel.org, OpenBMC Maillist, Linux ARM, linux-aspeed, Linux Kernel Mailing List Hi Joel, OK, I will update in next patch as you advised. Thanks for your review. On 2021/12/22 上午 09:22, Joel Stanley wrote: > On Fri, 17 Dec 2021 at 09:54, Jammy Huang <jammy_huang@aspeedtech.com> wrote: >> This is a workaround for polarity unstable. >> Sync value get by VR09C counts from sync's rising edge, which means >> sync's polarity is negative if sync value is bigger than total/2. >> >> Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> >> --- >> drivers/media/platform/aspeed-video.c | 18 ++++++++++++++++++ >> 1 file changed, 18 insertions(+) >> >> diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c >> index 5ad3a20c5bac..f628f69bb7dd 100644 >> --- a/drivers/media/platform/aspeed-video.c >> +++ b/drivers/media/platform/aspeed-video.c >> @@ -989,6 +989,15 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) >> video->frame_top = FIELD_GET(VE_SRC_TB_EDGE_DET_TOP, >> src_tb_edge); >> det->vsync = FIELD_GET(VE_SYNC_STATUS_VSYNC, sync); >> + /* >> + * Workaround for polarity detection >> + * Use sync(VR098) counts from sync's rising edge till falling >> + * edge to tell sync polarity. >> + */ >> + if (det->vsync > (FIELD_GET(VE_MODE_DETECT_V_LINES, mds) >> 1)) > Are you right shifting as this is the value / 2? I think it's clearer > to write / 2 instead of >> 1. > > Mention in the comment that this is a workaround for when the sync > value is larger than half. > >> + det->polarities &= ~V4L2_DV_VSYNC_POS_POL; >> + else >> + det->polarities |= V4L2_DV_VSYNC_POS_POL; >> if (det->polarities & V4L2_DV_VSYNC_POS_POL) { >> det->vbackporch = video->frame_top - det->vsync; >> det->vfrontporch = >> @@ -1010,6 +1019,15 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) >> video->frame_left = FIELD_GET(VE_SRC_LR_EDGE_DET_LEFT, >> src_lr_edge); >> det->hsync = FIELD_GET(VE_SYNC_STATUS_HSYNC, sync); >> + /* >> + * Workaround for polarity detection >> + * Use sync(VR098) counts from sync's rising edge till falling >> + * edge to tell sync polarity. >> + */ >> + if (det->hsync > (htotal >> 1)) >> + det->polarities &= ~V4L2_DV_HSYNC_POS_POL; >> + else >> + det->polarities |= V4L2_DV_HSYNC_POS_POL; >> if (det->polarities & V4L2_DV_HSYNC_POS_POL) { >> det->hbackporch = video->frame_left - det->hsync; >> det->hfrontporch = htotal - video->frame_right; >> -- >> 2.25.1 >> -- Best Regards Jammy _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PATCH 4/4] media: aspeed: Fix timing polarity incorrect @ 2021-12-22 6:10 ` Jammy Huang 0 siblings, 0 replies; 43+ messages in thread From: Jammy Huang @ 2021-12-22 6:10 UTC (permalink / raw) To: Joel Stanley Cc: linux-aspeed, Andrew Jeffery, OpenBMC Maillist, Eddie James, Linux Kernel Mailing List, Mauro Carvalho Chehab, Linux ARM, linux-media@vger.kernel.org Hi Joel, OK, I will update in next patch as you advised. Thanks for your review. On 2021/12/22 上午 09:22, Joel Stanley wrote: > On Fri, 17 Dec 2021 at 09:54, Jammy Huang <jammy_huang@aspeedtech.com> wrote: >> This is a workaround for polarity unstable. >> Sync value get by VR09C counts from sync's rising edge, which means >> sync's polarity is negative if sync value is bigger than total/2. >> >> Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> >> --- >> drivers/media/platform/aspeed-video.c | 18 ++++++++++++++++++ >> 1 file changed, 18 insertions(+) >> >> diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c >> index 5ad3a20c5bac..f628f69bb7dd 100644 >> --- a/drivers/media/platform/aspeed-video.c >> +++ b/drivers/media/platform/aspeed-video.c >> @@ -989,6 +989,15 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) >> video->frame_top = FIELD_GET(VE_SRC_TB_EDGE_DET_TOP, >> src_tb_edge); >> det->vsync = FIELD_GET(VE_SYNC_STATUS_VSYNC, sync); >> + /* >> + * Workaround for polarity detection >> + * Use sync(VR098) counts from sync's rising edge till falling >> + * edge to tell sync polarity. >> + */ >> + if (det->vsync > (FIELD_GET(VE_MODE_DETECT_V_LINES, mds) >> 1)) > Are you right shifting as this is the value / 2? I think it's clearer > to write / 2 instead of >> 1. > > Mention in the comment that this is a workaround for when the sync > value is larger than half. > >> + det->polarities &= ~V4L2_DV_VSYNC_POS_POL; >> + else >> + det->polarities |= V4L2_DV_VSYNC_POS_POL; >> if (det->polarities & V4L2_DV_VSYNC_POS_POL) { >> det->vbackporch = video->frame_top - det->vsync; >> det->vfrontporch = >> @@ -1010,6 +1019,15 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) >> video->frame_left = FIELD_GET(VE_SRC_LR_EDGE_DET_LEFT, >> src_lr_edge); >> det->hsync = FIELD_GET(VE_SYNC_STATUS_HSYNC, sync); >> + /* >> + * Workaround for polarity detection >> + * Use sync(VR098) counts from sync's rising edge till falling >> + * edge to tell sync polarity. >> + */ >> + if (det->hsync > (htotal >> 1)) >> + det->polarities &= ~V4L2_DV_HSYNC_POS_POL; >> + else >> + det->polarities |= V4L2_DV_HSYNC_POS_POL; >> if (det->polarities & V4L2_DV_HSYNC_POS_POL) { >> det->hbackporch = video->frame_left - det->hsync; >> det->hfrontporch = htotal - video->frame_right; >> -- >> 2.25.1 >> -- Best Regards Jammy ^ permalink raw reply [flat|nested] 43+ messages in thread
end of thread, other threads:[~2021-12-22 6:13 UTC | newest] Thread overview: 43+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2021-12-17 9:53 [PATCH 0/4] Correct timing report Jammy Huang 2021-12-17 9:53 ` Jammy Huang 2021-12-17 9:53 ` Jammy Huang 2021-12-17 9:54 ` [PATCH 1/4] media: aspeed: Correct value for h-total-pixels Jammy Huang 2021-12-17 9:54 ` Jammy Huang 2021-12-17 9:54 ` Jammy Huang 2021-12-22 0:54 ` Joel Stanley 2021-12-22 0:54 ` Joel Stanley 2021-12-22 0:54 ` Joel Stanley 2021-12-22 0:54 ` Joel Stanley 2021-12-17 9:54 ` [PATCH 2/4] media: aspeed: Use FIELD_GET to improve readability Jammy Huang 2021-12-17 9:54 ` Jammy Huang 2021-12-17 9:54 ` Jammy Huang 2021-12-22 0:59 ` Joel Stanley 2021-12-22 0:59 ` Joel Stanley 2021-12-22 0:59 ` Joel Stanley 2021-12-22 0:59 ` Joel Stanley 2021-12-22 6:10 ` Jammy Huang 2021-12-22 6:10 ` Jammy Huang 2021-12-22 6:10 ` Jammy Huang 2021-12-22 6:10 ` Jammy Huang 2021-12-17 9:54 ` [PATCH 3/4] media: aspeed: Correct values for detected timing Jammy Huang 2021-12-17 9:54 ` Jammy Huang 2021-12-17 9:54 ` Jammy Huang 2021-12-22 1:31 ` Joel Stanley 2021-12-22 1:31 ` Joel Stanley 2021-12-22 1:31 ` Joel Stanley 2021-12-22 1:31 ` Joel Stanley 2021-12-22 6:11 ` Jammy Huang 2021-12-22 6:11 ` Jammy Huang 2021-12-22 6:11 ` Jammy Huang 2021-12-22 6:11 ` Jammy Huang 2021-12-17 9:54 ` [PATCH 4/4] media: aspeed: Fix timing polarity incorrect Jammy Huang 2021-12-17 9:54 ` Jammy Huang 2021-12-17 9:54 ` Jammy Huang 2021-12-22 1:22 ` Joel Stanley 2021-12-22 1:22 ` Joel Stanley 2021-12-22 1:22 ` Joel Stanley 2021-12-22 1:22 ` Joel Stanley 2021-12-22 6:10 ` Jammy Huang 2021-12-22 6:10 ` Jammy Huang 2021-12-22 6:10 ` Jammy Huang 2021-12-22 6:10 ` Jammy Huang
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.