From patchwork Fri Dec 17 09:54:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jammy Huang X-Patchwork-Id: 79575 Received: from vger.kernel.org ([23.128.96.18]) by www.linuxtv.org with esmtp (Exim 4.92) (envelope-from ) id 1my9wy-006ebx-Re; Fri, 17 Dec 2021 09:54:56 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234600AbhLQJyf (ORCPT + 1 other); Fri, 17 Dec 2021 04:54:35 -0500 Received: from twspam01.aspeedtech.com ([211.20.114.71]:27994 "EHLO twspam01.aspeedtech.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234601AbhLQJyc (ORCPT ); Fri, 17 Dec 2021 04:54:32 -0500 Received: from mail.aspeedtech.com ([192.168.0.24]) by twspam01.aspeedtech.com with ESMTP id 1BH9SGjY026174; Fri, 17 Dec 2021 17:28:16 +0800 (GMT-8) (envelope-from jammy_huang@aspeedtech.com) Received: from JammyHuang-PC.aspeed.com (192.168.2.115) by TWMBX02.aspeed.com (192.168.0.24) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 17 Dec 2021 17:53:46 +0800 From: Jammy Huang To: , , , , , , , , Subject: [PATCH 1/4] media: aspeed: Correct value for h-total-pixels Date: Fri, 17 Dec 2021 17:54:00 +0800 Message-ID: <20211217095403.2618-2-jammy_huang@aspeedtech.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211217095403.2618-1-jammy_huang@aspeedtech.com> References: <20211217095403.2618-1-jammy_huang@aspeedtech.com> MIME-Version: 1.0 X-Originating-IP: [192.168.2.115] X-ClientProxiedBy: TWMBX02.aspeed.com (192.168.0.24) To TWMBX02.aspeed.com (192.168.0.24) X-DNSRBL: X-MAIL: twspam01.aspeedtech.com 1BH9SGjY026174 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-LSpam-Score: -2.4 (--) X-LSpam-Report: No, score=-2.4 required=5.0 tests=BAYES_00=-1.9,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1 autolearn=ham autolearn_force=no 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 Reviewed-by: Joel Stanley --- 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; From patchwork Fri Dec 17 09:54:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jammy Huang X-Patchwork-Id: 79574 Received: from vger.kernel.org ([23.128.96.18]) by www.linuxtv.org with esmtp (Exim 4.92) (envelope-from ) id 1my9wu-006ebx-3O; Fri, 17 Dec 2021 09:54:52 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234597AbhLQJyf (ORCPT + 1 other); Fri, 17 Dec 2021 04:54:35 -0500 Received: from twspam01.aspeedtech.com ([211.20.114.71]:5928 "EHLO twspam01.aspeedtech.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234595AbhLQJy3 (ORCPT ); Fri, 17 Dec 2021 04:54:29 -0500 Received: from mail.aspeedtech.com ([192.168.0.24]) by twspam01.aspeedtech.com with ESMTP id 1BH9SGVA026175; Fri, 17 Dec 2021 17:28:16 +0800 (GMT-8) (envelope-from jammy_huang@aspeedtech.com) Received: from JammyHuang-PC.aspeed.com (192.168.2.115) by TWMBX02.aspeed.com (192.168.0.24) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 17 Dec 2021 17:53:46 +0800 From: Jammy Huang To: , , , , , , , , Subject: [PATCH 2/4] media: aspeed: Use FIELD_GET to improve readability Date: Fri, 17 Dec 2021 17:54:01 +0800 Message-ID: <20211217095403.2618-3-jammy_huang@aspeedtech.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211217095403.2618-1-jammy_huang@aspeedtech.com> References: <20211217095403.2618-1-jammy_huang@aspeedtech.com> MIME-Version: 1.0 X-Originating-IP: [192.168.2.115] X-ClientProxiedBy: TWMBX02.aspeed.com (192.168.0.24) To TWMBX02.aspeed.com (192.168.0.24) X-DNSRBL: X-MAIL: twspam01.aspeedtech.com 1BH9SGVA026175 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-LSpam-Score: -2.4 (--) X-LSpam-Report: No, score=-2.4 required=5.0 tests=BAYES_00=-1.9,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1 autolearn=ham autolearn_force=no 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 Reviewed-by: Joel Stanley --- 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; From patchwork Fri Dec 17 09:54:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jammy Huang X-Patchwork-Id: 79571 Received: from vger.kernel.org ([23.128.96.18]) by www.linuxtv.org with esmtp (Exim 4.92) (envelope-from ) id 1my9wh-006ebx-Dh; Fri, 17 Dec 2021 09:54:40 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234599AbhLQJyb (ORCPT + 1 other); Fri, 17 Dec 2021 04:54:31 -0500 Received: from twspam01.aspeedtech.com ([211.20.114.71]:47616 "EHLO twspam01.aspeedtech.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234577AbhLQJy2 (ORCPT ); Fri, 17 Dec 2021 04:54:28 -0500 Received: from mail.aspeedtech.com ([192.168.0.24]) by twspam01.aspeedtech.com with ESMTP id 1BH9SGVB026175; Fri, 17 Dec 2021 17:28:16 +0800 (GMT-8) (envelope-from jammy_huang@aspeedtech.com) Received: from JammyHuang-PC.aspeed.com (192.168.2.115) by TWMBX02.aspeed.com (192.168.0.24) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 17 Dec 2021 17:53:46 +0800 From: Jammy Huang To: , , , , , , , , Subject: [PATCH 3/4] media: aspeed: Correct values for detected timing Date: Fri, 17 Dec 2021 17:54:02 +0800 Message-ID: <20211217095403.2618-4-jammy_huang@aspeedtech.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211217095403.2618-1-jammy_huang@aspeedtech.com> References: <20211217095403.2618-1-jammy_huang@aspeedtech.com> MIME-Version: 1.0 X-Originating-IP: [192.168.2.115] X-ClientProxiedBy: TWMBX02.aspeed.com (192.168.0.24) To TWMBX02.aspeed.com (192.168.0.24) X-DNSRBL: X-MAIL: twspam01.aspeedtech.com 1BH9SGVB026175 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-LSpam-Score: -2.4 (--) X-LSpam-Report: No, score=-2.4 required=5.0 tests=BAYES_00=-1.9,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1 autolearn=ham autolearn_force=no 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 --- 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; From patchwork Fri Dec 17 09:54:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jammy Huang X-Patchwork-Id: 79573 Received: from vger.kernel.org ([23.128.96.18]) by www.linuxtv.org with esmtp (Exim 4.92) (envelope-from ) id 1my9wo-006ebx-6b; Fri, 17 Dec 2021 09:54:47 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234596AbhLQJye (ORCPT + 1 other); Fri, 17 Dec 2021 04:54:34 -0500 Received: from twspam01.aspeedtech.com ([211.20.114.71]:26193 "EHLO twspam01.aspeedtech.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234592AbhLQJy2 (ORCPT ); Fri, 17 Dec 2021 04:54:28 -0500 Received: from mail.aspeedtech.com ([192.168.0.24]) by twspam01.aspeedtech.com with ESMTP id 1BH9SGrS026176; Fri, 17 Dec 2021 17:28:16 +0800 (GMT-8) (envelope-from jammy_huang@aspeedtech.com) Received: from JammyHuang-PC.aspeed.com (192.168.2.115) by TWMBX02.aspeed.com (192.168.0.24) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 17 Dec 2021 17:53:46 +0800 From: Jammy Huang To: , , , , , , , , Subject: [PATCH 4/4] media: aspeed: Fix timing polarity incorrect Date: Fri, 17 Dec 2021 17:54:03 +0800 Message-ID: <20211217095403.2618-5-jammy_huang@aspeedtech.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211217095403.2618-1-jammy_huang@aspeedtech.com> References: <20211217095403.2618-1-jammy_huang@aspeedtech.com> MIME-Version: 1.0 X-Originating-IP: [192.168.2.115] X-ClientProxiedBy: TWMBX02.aspeed.com (192.168.0.24) To TWMBX02.aspeed.com (192.168.0.24) X-DNSRBL: X-MAIL: twspam01.aspeedtech.com 1BH9SGrS026176 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-LSpam-Score: -2.4 (--) X-LSpam-Report: No, score=-2.4 required=5.0 tests=BAYES_00=-1.9,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1 autolearn=ham autolearn_force=no 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 --- 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;