From patchwork Wed Oct 26 15:33:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 13020853 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7459CC38A2D for ; Wed, 26 Oct 2022 15:49:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Ac5fXAQEh7R8aS2RJa0YvR8h7peDyUEnyU3pe5ZSMXs=; b=2LJyQ/1uoj/BUs W1+K/xa+VgTaoFaZWqO2MgRo1yIpeYxmcny1/PRyQieNvbJjHhUOlUHZwWcSeB4+/X/Ws0WpH9Coe DMgZPr/B1CtKmXeQo+ZrHUuFY96ggZ8ApwW9SNh6gCOiBM/OUOcqAt3jaWzV4acFSchVaVmFszjTX vWI5Lexi8axAPrYIdbEuQSav3R1VSAZ3tpqQhYLGfORUASO1MYhx+SEkwl53YfgZsdNpF5oaXjhbn /TXpZgCBBPOnfc3EuWdW4yKlmkr47SR+ykzcARh2fYMIeQC6zEi1vlLwXl9atPL/UiaOVynjF7N+5 Jw3S6KQagRjZKWMfjqnQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1onid7-009zHB-99; Wed, 26 Oct 2022 15:47:46 +0000 Received: from new4-smtp.messagingengine.com ([66.111.4.230]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oniQ1-009uDH-Os for linux-arm-kernel@lists.infradead.org; Wed, 26 Oct 2022 15:34:16 +0000 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailnew.nyi.internal (Postfix) with ESMTP id 0556F580260; Wed, 26 Oct 2022 11:34:13 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 26 Oct 2022 11:34:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cerno.tech; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm3; t=1666798453; x= 1666805653; bh=7oYNZ/WLyFOxEAuVgKzwZ3R8/Ec3wa7tyLYyhZ7n/Ac=; b=w vRO1rADZGvVTmMBx0Fxem3BoR/VPK4lSiDbx+8q73q3EqDyGiUuGzyu/vq2De/Ms NJ3FeFuUF+692gXg5GO069y3cCm8zgBfTWSznBInil/d09deIBIPE0vPaWOgEurF KXIl9tUr2mcKdkSB0U7lIt1GukVkJCQOVAZQetRIwCHeWVArtUfJQJjj6eybbA6g J+x3OwvVqjs48/fNY/WBflBr3Ao1FmxCam/3gaGn1G50ZRqyzX+5+Kp1G3OU33Ho lALw56Jf0vdWF9YJNplUvYEQ9U2bvtDw4gKzyOZAz4V8Fw3QZtrFfpdE86YBk++s vj/sPvqNBhaBOpOOf/0KQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1666798453; x= 1666805653; bh=7oYNZ/WLyFOxEAuVgKzwZ3R8/Ec3wa7tyLYyhZ7n/Ac=; b=e iqJIUi0er26sOMjxeFtrO2OL2UeGkqFie2OQntk5gcb2bQuX8xD/3dwQxfA4Wa94 H+2iQRhRyEGRWDAOKn8HkCsQ3C+rhN1t0uMKVA0OIB9F2Rt44Uceaak4rx4J4Jno SLwujKQIyCpf9qwz/ntIgAANWUjKEwgBsLxsRjvv+IH1D7VsoLw8j+sLVSgxXyYB AaZJzidrrkg4dilE2DKdzH2Kz/0Aahk/90UTisxI0B5hGOJpA+zrVDSgZgJJ7gJ8 wQ085y2QFma4CwIf70H0oTjukGrm+Xs8dQuApQvswiKIkvcDmg7h1PLa1Anu/HJS 4tTEJE562Ih85/6LgR/mA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrtddvgdeltdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhfffuggfgtgfkfhgjvfevofesthekredtredtjeenucfhrhhomhepmhgrgihi mhgvsegtvghrnhhordhtvggthhenucggtffrrghtthgvrhhnpeeltdekveelgfelveelfe duheelvdegudffgefhudehgeevjefhhefhhefgvdeuvdenucevlhhushhtvghrufhiiigv pedvnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmrgigihhmvgestggvrhhnohdrthgvtg hh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 26 Oct 2022 11:34:12 -0400 (EDT) From: maxime@cerno.tech Date: Wed, 26 Oct 2022 17:33:39 +0200 Subject: [PATCH v6 20/23] drm/vc4: vec: Check for VEC output constraints MIME-Version: 1.0 Message-Id: <20220728-rpi-analog-tv-properties-v6-20-e7792734108f@cerno.tech> References: <20220728-rpi-analog-tv-properties-v6-0-e7792734108f@cerno.tech> In-Reply-To: <20220728-rpi-analog-tv-properties-v6-0-e7792734108f@cerno.tech> To: Karol Herbst , Emma Anholt , Ben Skeggs , Chen-Yu Tsai , Rodrigo Vivi , Maarten Lankhorst , Jani Nikula , Daniel Vetter , Thomas Zimmermann , Tvrtko Ursulin , Samuel Holland , Jernej Skrabec , David Airlie , Maxime Ripard , Joonas Lahtinen , Lyude Paul Cc: =?unknown-8bit?q?linux-sunxi=40lists=2Elinux=2Edev=2C_Maxime_Ripard_=3Cm?= =?unknown-8bit?q?axime=40cerno=2Etech=3E=2C_intel-gfx=40lists=2Efreedesktop?= =?unknown-8bit?q?=2Eorg=2C?= =?unknown-8bit?q?_Phil_Elwell_=3Cphil=40raspberrypi=2Ecom=3E=2C_linux-arm-ke?= =?unknown-8bit?q?rnel=40lists=2Einfradead=2Eorg=2C_nouveau=40lists=2Efreede?= =?unknown-8bit?q?sktop=2Eorg=2C?= =?unknown-8bit?q?_Hans_de_Goede_=3Chdegoede=40redhat=2Ecom=3E=2C_Dom_Cobley_?= =?unknown-8bit?q?=3Cdom=40raspberrypi=2Ecom=3E=2C?= =?unknown-8bit?q?_Mateusz_Kwiatkowski_=3Ckfyatek+publicgit=40gmail=2Ecom=3E?= =?unknown-8bit?q?=2C_dri-devel=40lists=2Efreedesktop=2Eorg=2C?= =?unknown-8bit?q?_Dave_Stevenson_=3Cdave=2Estevenson=40raspberrypi=2Ecom=3E?= =?unknown-8bit?q?=2C_linux-kernel=40vger=2Ekernel=2Eorg=2C_Noralf_Tr=C3=B8n?= =?unknown-8bit?q?nes_=3Cnoralf=40tronnes=2Eorg=3E=2C?= =?unknown-8bit?q?_Geert_Uytterhoeven_=3Cgeert=40linux-m68k=2Eorg=3E?= X-Mailer: b4 0.11.0-dev-99e3a X-Developer-Signature: v=1; a=openpgp-sha256; l=2459; i=maxime@cerno.tech; h=from:subject:message-id; bh=OzLQ7pSaF80hWp8dAqMToRnA49hvkRverKkh4PGYboM=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMmRwe6BEVNEn6k3bTqS82SGUF7ne5N9ne1VS9gsnvz4d3+J lFNwRykLgxgXg6yYIkuMsPmSuFOzXney8c2DmcPKBDKEgYtTACbynZHhf2bjjNsrJl1PTPqaPT35Gd f7ktCuMz7iycbrHX9kNdtJn2ZkmDnxYckeYYbuGRFbjrBP6z2SepC9acPG8Jw9R2bLvdXsYAUA X-Developer-Key: i=maxime@cerno.tech; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221026_083413_948658_AC4B1354 X-CRM114-Status: GOOD ( 11.51 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Mateusz Kwiatkowski The VEC can accept pretty much any relatively reasonable mode, but still has a bunch of constraints to meet. Let's create an atomic_check() implementation that will make sure we don't end up accepting a non-functional mode. Acked-by: Noralf Trønnes Signed-off-by: Mateusz Kwiatkowski Signed-off-by: Maxime Ripard --- Changes in v6: - Used htotal instead of vtotal to discriminate PAL against NTSC --- drivers/gpu/drm/vc4/vc4_vec.c | 50 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/drivers/gpu/drm/vc4/vc4_vec.c b/drivers/gpu/drm/vc4/vc4_vec.c index 90e375a8a8f9..bfa8a58dba30 100644 --- a/drivers/gpu/drm/vc4/vc4_vec.c +++ b/drivers/gpu/drm/vc4/vc4_vec.c @@ -453,6 +453,7 @@ static int vc4_vec_encoder_atomic_check(struct drm_encoder *encoder, struct drm_crtc_state *crtc_state, struct drm_connector_state *conn_state) { + const struct drm_display_mode *mode = &crtc_state->adjusted_mode; const struct vc4_vec_tv_mode *vec_mode; vec_mode = &vc4_vec_tv_modes[conn_state->tv.legacy_mode]; @@ -461,6 +462,55 @@ static int vc4_vec_encoder_atomic_check(struct drm_encoder *encoder, !drm_mode_equal(vec_mode->mode, &crtc_state->adjusted_mode)) return -EINVAL; + if (mode->crtc_hdisplay % 4) + return -EINVAL; + + if (!(mode->crtc_hsync_end - mode->crtc_hsync_start)) + return -EINVAL; + + switch (mode->htotal) { + /* NTSC */ + case 858: + if (mode->crtc_vtotal > 262) + return -EINVAL; + + if (mode->crtc_vdisplay < 1 || mode->crtc_vdisplay > 253) + return -EINVAL; + + if (!(mode->crtc_vsync_start - mode->crtc_vdisplay)) + return -EINVAL; + + if ((mode->crtc_vsync_end - mode->crtc_vsync_start) != 3) + return -EINVAL; + + if ((mode->crtc_vtotal - mode->crtc_vsync_end) < 4) + return -EINVAL; + + break; + + /* PAL/SECAM */ + case 864: + if (mode->crtc_vtotal > 312) + return -EINVAL; + + if (mode->crtc_vdisplay < 1 || mode->crtc_vdisplay > 305) + return -EINVAL; + + if (!(mode->crtc_vsync_start - mode->crtc_vdisplay)) + return -EINVAL; + + if ((mode->crtc_vsync_end - mode->crtc_vsync_start) != 3) + return -EINVAL; + + if ((mode->crtc_vtotal - mode->crtc_vsync_end) < 2) + return -EINVAL; + + break; + + default: + return -EINVAL; + } + return 0; }