From patchwork Sat Oct 22 07:28:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 7634 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp1107577wrr; Sat, 22 Oct 2022 01:41:22 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7bHMrnF/QLxme1tchMBeias3na9YTcoMU3ck9VSZ1f0bt6bTmY2Y615+lNO4O7jhFxMLze X-Received: by 2002:a05:6402:34d0:b0:460:96c4:94af with SMTP id w16-20020a05640234d000b0046096c494afmr11619986edc.365.1666428082634; Sat, 22 Oct 2022 01:41:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666428082; cv=none; d=google.com; s=arc-20160816; b=jprzi98QOUYeVhzsEQ/mI6N12+yqXlVK5apG5EowsprDn2+nwZZm+pColLxyHFuuI7 O9kkb4jQXho8FubllpiSH+LUwcY4wEc1ZU12VSy4Uk490VNY8r9zp7glzyU7KpKaPhUr ZLu3dPo75VgNU2a2KoACTbJymKyNWncOA9ovj01mJu9EkU+ULIcokEr6U/Bhx5QYoVdN nOAzqNDL/AybzsrFLk19Vsd1i6YkG/jYCStNiS6rFSyRczctR/HmzjP8e/ZKbgjkVQyJ 0U2Jo87LLpWi/P1S+RxMTgwJyq00l3cFszoSdlic+DiXqGPXjRePfMnGiCafCPSztTIs rpzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=eK8pLtymwl12CRJdMtE2GMNvtXxO+HwsPAQcgMQaXfY=; b=q4muwoUYsLL1GBM/zzPiMnDX1zuwGCILVOwux/9WvfTQPJCLKImOWqEsPU+AvPi+uw uB4bg53cWQZp+tV0xdU8/f/yhZarzB0eGbkZMqiYC0cORrojbCck2efzPdtjOFL01jXD OIdTgNsWGhSUHt58Yi17UFn3l6otUijBqaMw9lfKB1CFth8+64Q5C+nI3S3JrCumZCGp nktW39XPJATMIcqo5fmt8pGPJHCoMQbI/Hojx1t4MBheQWjikOuXqOpvAoEYlD9Y7tT/ uvQ5nj//D44uCfKA+oK1zGev8YpIVLvTf3UBz2izdQj1hjt8WJMKkbNa+jpBPzHGMjV2 chkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="Xh/Gt64j"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id pk21-20020a170906d7b500b0078db6f488c2si19945060ejb.56.2022.10.22.01.40.52; Sat, 22 Oct 2022 01:41:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="Xh/Gt64j"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234346AbiJVIhS (ORCPT + 99 others); Sat, 22 Oct 2022 04:37:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41324 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233821AbiJVIba (ORCPT ); Sat, 22 Oct 2022 04:31:30 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E75B42E5E06; Sat, 22 Oct 2022 01:03:13 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id A7BD7B82DF2; Sat, 22 Oct 2022 08:02:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EEA06C433C1; Sat, 22 Oct 2022 08:02:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666425770; bh=scH4qEzCtXeEEbH+HVY3DscdNarNOhCopKbgKjvj6Pc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Xh/Gt64j/V8oeaYN0PHXG5+4dNsNwYrWp9KhMw8kBb0aGk9JxijNG84jW4Iu7H9Ah ptdr+SHBdmp0Qung7t+YkbG9lSSfqfEpnKvma6X1ZsprMWLUD8aqONsZC8uj2Lf7t1 O2QxI+mPYVEEpekEFBp0K69yIAdq/V5ubdeOfdkA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mateusz Kwiatkowski , =?utf-8?q?Noralf_Tr?= =?utf-8?q?=C3=B8nnes?= , Maxime Ripard , Sasha Levin Subject: [PATCH 5.19 610/717] drm/vc4: vec: Fix timings for VEC modes Date: Sat, 22 Oct 2022 09:28:09 +0200 Message-Id: <20221022072525.433202326@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221022072415.034382448@linuxfoundation.org> References: <20221022072415.034382448@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747376493219100196?= X-GMAIL-MSGID: =?utf-8?q?1747376493219100196?= From: Mateusz Kwiatkowski [ Upstream commit 30d7565be96b3946c18a1ce3fd538f7946839092 ] This commit fixes vertical timings of the VEC (composite output) modes to accurately represent the 525-line ("NTSC") and 625-line ("PAL") ITU-R standards. Previous timings were actually defined as 502 and 601 lines, resulting in non-standard 62.69 Hz and 52 Hz signals being generated, respectively. Signed-off-by: Mateusz Kwiatkowski Acked-by: Noralf Trønnes Signed-off-by: Maxime Ripard Link: https://patchwork.freedesktop.org/patch/msgid/20220728-rpi-analog-tv-properties-v2-28-459522d653a7@cerno.tech Signed-off-by: Sasha Levin --- drivers/gpu/drm/vc4/vc4_vec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_vec.c b/drivers/gpu/drm/vc4/vc4_vec.c index 11fc3d6f66b1..4e2250b8fa23 100644 --- a/drivers/gpu/drm/vc4/vc4_vec.c +++ b/drivers/gpu/drm/vc4/vc4_vec.c @@ -256,7 +256,7 @@ static void vc4_vec_ntsc_j_mode_set(struct vc4_vec *vec) static const struct drm_display_mode ntsc_mode = { DRM_MODE("720x480", DRM_MODE_TYPE_DRIVER, 13500, 720, 720 + 14, 720 + 14 + 64, 720 + 14 + 64 + 60, 0, - 480, 480 + 3, 480 + 3 + 3, 480 + 3 + 3 + 16, 0, + 480, 480 + 7, 480 + 7 + 6, 525, 0, DRM_MODE_FLAG_INTERLACE) }; @@ -278,7 +278,7 @@ static void vc4_vec_pal_m_mode_set(struct vc4_vec *vec) static const struct drm_display_mode pal_mode = { DRM_MODE("720x576", DRM_MODE_TYPE_DRIVER, 13500, 720, 720 + 20, 720 + 20 + 64, 720 + 20 + 64 + 60, 0, - 576, 576 + 2, 576 + 2 + 3, 576 + 2 + 3 + 20, 0, + 576, 576 + 4, 576 + 4 + 6, 625, 0, DRM_MODE_FLAG_INTERLACE) };