From patchwork Mon Oct 24 11:33:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9457 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp480135wru; Mon, 24 Oct 2022 07:20:29 -0700 (PDT) X-Google-Smtp-Source: AMsMyM56NZOqLZ6y8J0vyxeC1QOZWISUnzK1H87idDHl13d8SsiZtSJ5vvgM0IiKkgRsuHs8QqEO X-Received: by 2002:a17:907:74a:b0:77e:9455:b4e1 with SMTP id xc10-20020a170907074a00b0077e9455b4e1mr28432666ejb.462.1666621229069; Mon, 24 Oct 2022 07:20:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666621229; cv=none; d=google.com; s=arc-20160816; b=d+tkKM8FkS+mq1PbBSajxce0Edv6wup/r5TPzjMJZ6pVBL8n/uu9SVnXs4Ug1N7TL8 D/uB5T9CaTts69BfS2uprZ3AJIIRTcaF7S2T0S2rlcT/CatrUsBnY0CVTQ/lB4mxZXx8 CEPZ+TpURtxuv9c4lgKLrCien0UICsct89c4KVHRxBal36Ui7+nAiEHl3dv5yzesOkjc ohDE4CObIbKO9QTE74A0HLSWoJgjGjHEPI2l89a4HQzpqGLMe3CWM3gYBHlud5bEkbvU rsepy6bYGdgPntbBjBVWfTgwcciHdzzuPpa1stBKuaoji/dHMnudj1I9jOVZzpgzlnbw icQw== 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=AzqYmDtbTWo/Ss00QKL4rlOTvX998m0GJrarQ1WTWqVbl3Y7DrzBfQdm0FuYPhkwNh tM/o+aQFir90ld+Ozfs7oL8fJJiqN9sRv3DEjDoxXzxf/3ox083NVwgbBGyVwu0BllFC YQfHsIGoRD6DkflSjRAk4ARckXhz7x8+kzKZA57xz0B9ZVH7YjU45sgBI4Pw249UObWx IRgoO8XMRBO47WscUyYKOZPQVIIwW5E2VQV5z+Q+Ger5IR1d3Q/KW42tg349t1aNloxH oQH85nN5sv60kH0QLA2/kDJ2TfBplfVcmp3FA8rgQN00DXrfdXuOElglaTWpuxToOLJ/ Ucrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=tr7mHzDO; 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 dm21-20020a170907949500b0077b21283d09si27291709ejc.349.2022.10.24.07.20.01; Mon, 24 Oct 2022 07:20:29 -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=tr7mHzDO; 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 S230171AbiJXOR5 (ORCPT + 99 others); Mon, 24 Oct 2022 10:17:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54582 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235346AbiJXOOl (ORCPT ); Mon, 24 Oct 2022 10:14:41 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BF56695A9; Mon, 24 Oct 2022 05:54:38 -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 dfw.source.kernel.org (Postfix) with ESMTPS id AE5E561347; Mon, 24 Oct 2022 12:52:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BF87EC433D7; Mon, 24 Oct 2022 12:52:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666615971; bh=scH4qEzCtXeEEbH+HVY3DscdNarNOhCopKbgKjvj6Pc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tr7mHzDOvdretFEj14kIDtxn1vKgjkdqo/XzdMyvMdhC6brUlIuXEA8Nf9lgzhv6q 5WeO6vMNs8icyxu4+hYuPDJaLoTzGMGyJuPLwQuXm80Qs0npJKFdJPgELxGCsCN9kR N7dfWdQwHWbQ1Wz0zJc/PAnb5z0Rs4zctTWg5tLg= 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.15 452/530] drm/vc4: vec: Fix timings for VEC modes Date: Mon, 24 Oct 2022 13:33:16 +0200 Message-Id: <20221024113105.506812106@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@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?1747579022216310622?= X-GMAIL-MSGID: =?utf-8?q?1747579022216310622?= 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) };