From patchwork Mon Oct 24 11:32: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: 9564 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp527113wru; Mon, 24 Oct 2022 09:00:21 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6j9Q6+JiY5Nytn05hYYLQlpANPDesFl5IW++fubQM74m4NFA7ueDCzP49YbQ5jUx+Ar7Ex X-Received: by 2002:a17:90b:4f8c:b0:213:245b:b49 with SMTP id qe12-20020a17090b4f8c00b00213245b0b49mr3304003pjb.110.1666627221201; Mon, 24 Oct 2022 09:00:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666627221; cv=none; d=google.com; s=arc-20160816; b=l2BZml2jbZk/43tMPZRgyLRuMGqHHaHOsRLHfs0IS9FNx/xpOcA0RE2RtdhqxiBtFm 0VwqsWcR4Ws847YjYR1ZgHFVj2UXXky8d0/9FIi6T3kfNSJ15hS2GtZ0R82PZ/txDvFm Yb9hYWoL21x4OmeueHC5iRtnV8yaGAbH49VS3B/y554KqR1Vnb3OxhgLWJG1UFue22PQ J0Ta3nVH6L9HzJHmSVW3O5SWoyXOfs8TFDZR2W4GlDJRWcrhecE/Bqmqjk441viFIaTm dakzD0f4yIKxh+c0eA4/EFyxSbRGhasqiWA9F8+VuGpmOK2G2YL58TI1xeBp7rlcyl/R Qntg== 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=dXqMaEDLXttI5E50FlEe9vocTnHrhfAcqvBQtlc0e3o=; b=rG7mFR+3s3kjR30zclIUxiIpJ+dwdUdxMZ8Qf1sH6hr03pwVsQeQCXQUL4m3wb9prb tHMuuR4yiVJAifnuaYOnwL7Gc92l/KnFTAWTYT0WS2pNjCR28Sjjo/JP5zUqtKUMJSMV 6LPNqlPvPrI2p2QPTJ0Isa8nI6fHTeJMIlthBfmZuvJiiNUAGRQZCgoEvHGB/RPGye6C kNsKcOKGBsm/iMsx34uSIgITBCfwayGI1KoALaDnKzRkM3XJxDfdpIgjoRsxxEz0IBRc unfNIM3yBWZke+563CcfVAIAec2syZZvJfjXJxJEbfxIm7YClRWwXOLQrCBZ6yOTPiwf 1hkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=i++qnugb; 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 w7-20020a056a0014c700b0053a339cafb3si66860pfu.53.2022.10.24.09.00.00; Mon, 24 Oct 2022 09:00:21 -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=i++qnugb; 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 S230287AbiJXPzx (ORCPT + 99 others); Mon, 24 Oct 2022 11:55:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35560 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231165AbiJXPzJ (ORCPT ); Mon, 24 Oct 2022 11:55:09 -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 B5FB4100BD4; Mon, 24 Oct 2022 07:50:37 -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 BF678B81331; Mon, 24 Oct 2022 12:30:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 19D96C433D6; Mon, 24 Oct 2022 12:30:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666614623; bh=rDGR6WxWcKz0GLoKdiF+LPWjqv10NnK1ij4BucIKLCg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i++qnugbjnNBo5oNHmopCxEaqEDitclgvJstAqToxiL/2U5UuAncoJYIhVRNSaTo0 dDGZGml8w0uHnzHWGD3TNDXeaRU6l7f2/7vyE1tn6Hi+TGgNcDYqS+dqOgHSXSYLYd ULG4krffXlcXm5g//1LsvjQZH4kQ0NixQXFNFKkM= 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.10 332/390] drm/vc4: vec: Fix timings for VEC modes Date: Mon, 24 Oct 2022 13:32:09 +0200 Message-Id: <20221024113037.135772623@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113022.510008560@linuxfoundation.org> References: <20221024113022.510008560@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 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?1747585305339452696?= X-GMAIL-MSGID: =?utf-8?q?1747585305339452696?= 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 bd5b8eb58b18..c6bd168a5898 100644 --- a/drivers/gpu/drm/vc4/vc4_vec.c +++ b/drivers/gpu/drm/vc4/vc4_vec.c @@ -257,7 +257,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) }; @@ -279,7 +279,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) };