From patchwork Mon Oct 24 11:31:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8847 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp432927wru; Mon, 24 Oct 2022 05:48:06 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6sWhfnOalPhvhcdLx1yRzG7wpgE2kMPwH5PgHoYX5JR9W2sCAOFFlNxB4a1hbizv788NAa X-Received: by 2002:a62:a512:0:b0:536:e2bd:e15e with SMTP id v18-20020a62a512000000b00536e2bde15emr33953450pfm.1.1666615686291; Mon, 24 Oct 2022 05:48:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666615686; cv=none; d=google.com; s=arc-20160816; b=xivbPkqMDNvpRINXJp0othknszqr74okOQvdOa1LcoXqPnwJSGOjSwZrVH9rMpZDXU 6RVePGi4F2Kly+Knttk6kKhd63imDcF7cI3lHmFkz5bnBodEtYl5hrs7uvvL172LFbLq Nnr7p7VcJm8GRKdW7Is6jTj7Y1/1YLbqwOpklIqLDRPtWlShJFH8OjpP9vCiNUPrtVLY 8+TUNK68sfO9Tj0UcjI44g2tlqlAUcdnMhLVOZbMdAWeu17h/7QD2dVD0pgzBXS2CSC4 Yx5ZYDeIWljZ/8KlTlNDbTe1mEeg3PGlxP64ggQ+baWpC94STwqPnW5tCBEfpXiW9S0B Acfg== 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=xZvZdfzIIOgy2IMlWorEamHN7BDZoYXDJ/TEXieA5YU=; b=MpafuV/n/fNuPEGXJXSgJLru1gRL6DHvNMmoEr98lHmGE5FbMvr3X9QYB6s5sH01X1 j/s35J4IgxVRXKvAvoTrHtMYORmI4pdRQ1e4wue0/uZJVOc+8cj8knbjryCmqu1LJT0q DxSzpt/Xnp1QxVnWn8Z/6pMQX6gptYU80dmKUIrRf68rxCiI7epLGCHSpb486LZ5giYq s1Rzo/Oc2btcrxa+TX73jld7B2KYL9NOB2Edu96nTYgwAPzAMCkeYXkiUajojrbVNfWL pyQkTxTakcZlGExvRkm4ztEe1w7ANVbHX554ijdaljiFOxYpncChA2WOh/JvWjfH/0Fa LiuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=2HArZGhY; 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 u14-20020a63df0e000000b00455ee9915c3si34735455pgg.746.2022.10.24.05.47.42; Mon, 24 Oct 2022 05:48:06 -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=2HArZGhY; 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 S234611AbiJXMfd (ORCPT + 99 others); Mon, 24 Oct 2022 08:35:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53754 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234260AbiJXM3w (ORCPT ); Mon, 24 Oct 2022 08:29:52 -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 F1622BF4C; Mon, 24 Oct 2022 05:03:50 -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 C10E8612FC; Mon, 24 Oct 2022 12:03:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D8397C433C1; Mon, 24 Oct 2022 12:03:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666612988; bh=oLQNDm95SWVtvPjxRy2VakTKeT3riPaK0HtW3lY2t8k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2HArZGhYaZtNx3rI0lSjhtheESYo1rHWR+N8+EKpzUvN85er0ElhEBE+O07cQoCYK dihCFEcpK5snDQURzH1Z9DSUxPYSqamra6oOQGIkjmohnECn48zJdJERtdxacISMoo xM1M0wJ35s5tmx8QJnw+e3+yV/PK9aweiz8fDjVk= 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 4.19 196/229] drm/vc4: vec: Fix timings for VEC modes Date: Mon, 24 Oct 2022 13:31:55 +0200 Message-Id: <20221024113005.475032976@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112959.085534368@linuxfoundation.org> References: <20221024112959.085534368@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?1747573209914446280?= X-GMAIL-MSGID: =?utf-8?q?1747573209914446280?= 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 8e7facb6514e..ae0354ceb2a3 100644 --- a/drivers/gpu/drm/vc4/vc4_vec.c +++ b/drivers/gpu/drm/vc4/vc4_vec.c @@ -291,7 +291,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) }; @@ -313,7 +313,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) };