From patchwork Tue Nov 9 09:54:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jammy Huang X-Patchwork-Id: 12692110 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 629D3C433F5 for ; Tue, 9 Nov 2021 17:07:55 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1F74761177 for ; Tue, 9 Nov 2021 17:07:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 1F74761177 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=aspeedtech.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:To :From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=7aqZyvSD4npDZDTGf1JqFkXieASIjWKo225Cl0tMioI=; b=y55JyBp2CKgfUG ssUpocE58YX4emUFKj2fJYCFeGgZNZEnke/IpLjrWBW/yWYACOS/7HaWUKeSc5qKfBz2T0nJqz1Pd BnzQ9juEC5ANIfHVMJgtyM90Q/KUTsqsWeWm4C/kC1SeZbs+ugJ3bGmLSX/HrzwrvlZX8N5xqB4i4 JqvMbH+NeS0GD0ehRm35WI1V8oSz7mmOeXM2V0fk7v8pUF1qX1TPjYCkNbj9VzP5HyA2M+kR9MZc3 bAphuV3aKKh5VwnkVvDwpq/tyFslRuciwJRPlEqCvQ8xSmjms2gLFGg93B+ZS2XIncIsUP0vpY94F +qJjDQOp/kCUbImIqpxA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mkUZb-002pkz-LX; Tue, 09 Nov 2021 17:06:15 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mkUZY-002pkd-9q for linux-arm-kernel@bombadil.infradead.org; Tue, 09 Nov 2021 17:06:12 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:Content-Transfer-Encoding :MIME-Version:Message-ID:Date:Subject:To:From:Sender:Reply-To:Cc:Content-ID: Content-Description:In-Reply-To:References; bh=rfWBcrl93LmOTCADyUc5B7Jc5eWtq6rB1r2EfW3lgEE=; b=g6BCHo2NQLH+O2PPlW0qdrR/kj V+RdQZz0tm1K2MzkK5P0JOaZNHM3iN0Les7S+P2AKRWPk94vtKA6DGLDsBbxNQZ10HpW2N1IrJ5lF bsJoHO3tpqkdW1GyONRDtX7FwffnSylN39B/aOMkLItC3cWgA3dnvKcDVm01r+eMZLF1itqDUhAlt dTsXlfJ1cMFCo4Rq3Rb8snAINgquRSx6PYaf5zoD7iArVjMkHRVUDkGWhcBZY9hKSxS/WP/70yKdv M35U/Fgiimyjkt/U6ubpcQ+46lI30PFsN38btTtJjZfvdaVEq/tnJYwKvlQzfs4qnxGHuvU6TPYuo 62a0vrSg==; Received: from twspam01.aspeedtech.com ([211.20.114.71]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mkNqY-00F2S2-ET for linux-arm-kernel@lists.infradead.org; Tue, 09 Nov 2021 09:55:21 +0000 Received: from mail.aspeedtech.com ([192.168.0.24]) by twspam01.aspeedtech.com with ESMTP id 1A99VZMQ096262; Tue, 9 Nov 2021 17:31:35 +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; Tue, 9 Nov 2021 17:54:50 +0800 From: Jammy Huang To: , , , , , , , , Subject: [PATCH] media: aspeed: Fix incorrect resolution detected Date: Tue, 9 Nov 2021 17:54:53 +0800 Message-ID: <20211109095453.12363-1-jammy_huang@aspeedtech.com> X-Mailer: git-send-email 2.25.1 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 1A99VZMQ096262 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211109_095519_094938_1B208936 X-CRM114-Status: UNSURE ( 9.68 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org During the process of os-installation, detected resolution's height could be less than the correct one. Increase min-required-count of stable signal to fix the problem. Fixes: d2b4387f3bdf ("media: platform: Add Aspeed Video Engine driver") Signed-off-by: Jammy Huang --- drivers/media/platform/aspeed-video.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c index 5da52646b298..625a77ddb479 100644 --- a/drivers/media/platform/aspeed-video.c +++ b/drivers/media/platform/aspeed-video.c @@ -196,6 +196,12 @@ #define VE_INTERRUPT_VSYNC_DESC BIT(11) #define VE_MODE_DETECT 0x30c +#define VE_MODE_DT_HOR_TOLER GENMASK(31, 28) +#define VE_MODE_DT_VER_TOLER GENMASK(27, 24) +#define VE_MODE_DT_HOR_STABLE GENMASK(23, 20) +#define VE_MODE_DT_VER_STABLE GENMASK(19, 16) +#define VE_MODE_DT_EDG_THROD GENMASK(15, 8) + #define VE_MEM_RESTRICT_START 0x310 #define VE_MEM_RESTRICT_END 0x314 @@ -1199,7 +1205,12 @@ static void aspeed_video_init_regs(struct aspeed_video *video) aspeed_video_write(video, VE_SCALING_FILTER3, 0x00200000); /* Set mode detection defaults */ - aspeed_video_write(video, VE_MODE_DETECT, 0x22666500); + aspeed_video_write(video, VE_MODE_DETECT, + FIELD_PREP(VE_MODE_DT_HOR_TOLER, 2) | + FIELD_PREP(VE_MODE_DT_VER_TOLER, 2) | + FIELD_PREP(VE_MODE_DT_HOR_STABLE, 10) | + FIELD_PREP(VE_MODE_DT_VER_STABLE, 10) | + FIELD_PREP(VE_MODE_DT_EDG_THROD, 0x65)); aspeed_video_write(video, VE_BCD_CTRL, 0); }