From patchwork Mon Oct 24 11:31:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9004 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp440373wru; Mon, 24 Oct 2022 06:04:10 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4/tAtJ6UXmOkTevGSGcgWT/8odwSRjc8EYwpQuAz88kRrhbWLrBTIX0vRCrJV9gRgtOnOe X-Received: by 2002:a17:902:8542:b0:186:75ee:baac with SMTP id d2-20020a170902854200b0018675eebaacmr18356284plo.35.1666616650530; Mon, 24 Oct 2022 06:04:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666616650; cv=none; d=google.com; s=arc-20160816; b=C/BSsRKgwG8eCqYB7lnJFurOM4FfMnyrRJ8bzvZQzkseMJ/j2AcFpmVpgYcBI1N1IG WTGSO/6SzUpNVy+9mSKE2PX/WVfdZQfI0XpwONQv22cWAUbu1mDlCX/OGXEHGZsGquEZ zVQtZc8b7MkelUUkGBrkk5tDn9BxM++fvSuMQ3nW07Nt0yGsomFgKYH7Zl7IblAYvEt8 EU1eWClStUTCI+0NJiRYTNTiT5uv7ebmyyA85N3dwWXXyeAGMi9AJhCR93rBqS1bx7zM o3E7znrZz9lE9PgzZKa09ZsE4treXEu7xb2/WN3MTqobjBK9mz7wb6gGvozz/z7LwwV7 Qo+A== 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=gEqzW6H9dpg3V0ofk7wK1su6JoI8kDUgXgXhfmXVsbo=; b=w7qLLbkYE9g7LGY/Cfua9iqMd/oCMe3r1DUftXBBDizd/BAFGTxAUkGKlbK1bFazRj Ch82sIHpOEg7R4NzPL8At+kdIqFBUub1JgmDm4/09OIQw2iE5fjrWHh/uOLVdZBJ1OF2 ljIhOQm7hYKe3NS4oS5YhzA+1WYKMSWSCr7z7gM3uV0/pwwMsQNR5W4navC0mjWlQHM6 A15f9Su6cyvY1i4LduJJ4s8UNftCUfbcVTWj5MKzmmEnFJl5Tsy1YQ9xW7ASiXehNJvs zzGQfwmtRNTS05ltwih4n0EoNAGnb8VAYmv4dthGiAk5IK2ixFfk3ss6WSKI/qlcCw22 Tvdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="b/lbCdeV"; 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 l3-20020a170902f68300b001865f96f6f7si17605512plg.104.2022.10.24.06.03.17; Mon, 24 Oct 2022 06:04:10 -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="b/lbCdeV"; 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 S234981AbiJXNCl (ORCPT + 99 others); Mon, 24 Oct 2022 09:02:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42984 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235189AbiJXM7g (ORCPT ); Mon, 24 Oct 2022 08:59:36 -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 DCDDC8168B; Mon, 24 Oct 2022 05:19:05 -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 2DF22612E1; Mon, 24 Oct 2022 11:53:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 422BFC433C1; Mon, 24 Oct 2022 11:53:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666612407; bh=vE5rL+QOIEbIK8xVnEOaxCra1ZgilolzKDEk5wzU78s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=b/lbCdeVB3B/FEWDkCwVUoUGMo++i0oegFHRSq2s4JIaPLYauxYtqRg79+wPrjQgw LjiIWgFnxJPJ+pBVYjq/6zlpcvyTCt4LIUWlnmrmguy7UFRBrUPlHF1hMJm7R03JZ7 voxlmIdbxmkT47vefwCOS0MjqtPE9E9gsBMhKiuk= 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.14 186/210] drm/vc4: vec: Fix timings for VEC modes Date: Mon, 24 Oct 2022 13:31:43 +0200 Message-Id: <20221024113002.996469012@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112956.797777597@linuxfoundation.org> References: <20221024112956.797777597@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?1747574221114588519?= X-GMAIL-MSGID: =?utf-8?q?1747574221114588519?= 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 3a9a302247a2..bcf7880f84a8 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) };