From patchwork Mon Oct 24 11:32:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9176 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp458119wru; Mon, 24 Oct 2022 06:37:04 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6/gGL8SiTrLSwi1cTN1w4MUxoijpJae6DN8yG1sKWdX+OXb+dtFicSvWC8INp3e9pWNfy+ X-Received: by 2002:a17:907:94d1:b0:790:65a:3a18 with SMTP id dn17-20020a17090794d100b00790065a3a18mr26900150ejc.428.1666618624669; Mon, 24 Oct 2022 06:37:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666618624; cv=none; d=google.com; s=arc-20160816; b=MOMu1nrWwPIVSEw2/0F7Vw/J1gAs1n5YdS1aNydq3LdTfBLlyFVkGP08oOdZ2mReyv 8vRlpNknArMW2IqVTF/F93T3Mw1pMjfbZyEqvVFmbFNkJGCxm12baJqg2wzNdKekqtR7 EJqRXxaL1nWv01hC6GksFiyZ6yF/HFOHxub6XBJESGYPPpEhKJv0/Z0QyCk4QZjporyM 43BG6sqacd63nlY8wW4iX+phkYHEbiUlhriTl0GtPvSS3IRvEz1Tlzx01alXaC6EQl+9 ElaO34pL4rSTZerwDddzs+35hdiX+2HYKxL1A2+iZosa0mHGbpSASaUKjrN3luq6dI9D dLzA== 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=voZazJD3phgnsOh+VATDoWHikDK6pgAOv1nrwGzDiNY=; b=ChIET+lrHqTJe8dgkyTQ0XkBpOAHBXxLHYxv+MttM826LKB1BKJoS93Hh7Dt3bhRd1 pZ2V1cDUh0YvAVUspSVRkxK9o3zW0OVt12IJ4nFKn96PJUVoe7T88PZ1XQirOhbyq2XE fueGJgnA5qVJZWXEGaoe2HAxjGD8hDDeayL1nwkWNvOXeQZZg8Jvne9rsm16N5QYBOe8 U1u6h7jYSPJJdk5cEedvUDO7gecQs1BdLXyK2NjqKb33IVT2fs0nLO9L+hZ3n+dmynDN 9zxJscrni/S+9Xsa02OJvUtrNHRIYf/4QZVX64loNJEXM5n2bPpMaQtOc8ZKlG543EBN BZaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=b2FAVM6e; 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 b6-20020aa7c6c6000000b00461cb15df6dsi2111718eds.297.2022.10.24.06.36.31; Mon, 24 Oct 2022 06:37:04 -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=b2FAVM6e; 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 S232505AbiJXNbb (ORCPT + 99 others); Mon, 24 Oct 2022 09:31:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50720 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235881AbiJXN1s (ORCPT ); Mon, 24 Oct 2022 09:27:48 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 07EBCAA3E3; Mon, 24 Oct 2022 05:31:57 -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 8C6E0612DB; Mon, 24 Oct 2022 12:14:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9C9A3C433C1; Mon, 24 Oct 2022 12:14:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666613643; bh=Ta5mvod/xTVjJfuaXj2rb0yeljAOvEtb7iU+NeRk/2c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=b2FAVM6egEaskD0FHTWMpgZ+BFiQRLtkYionctl4I6mur9iS37ptYPydfAUSAh231 a74XG+2DODMv37eeS66cgf1+vFJ6GEFgAkfOQS/JOf9d+wu4aY79m2zpd2xrejs5Br u90ZlaS7So9jozWTXvJIGqdO5Gwl17lDuH3kYyT8= 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.4 214/255] drm/vc4: vec: Fix timings for VEC modes Date: Mon, 24 Oct 2022 13:32:04 +0200 Message-Id: <20221024113010.173682818@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113002.471093005@linuxfoundation.org> References: <20221024113002.471093005@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?1747576290954329960?= X-GMAIL-MSGID: =?utf-8?q?1747576290954329960?= 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 7402bc768664..0c764fd8399a 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) };