From patchwork Mon Nov 7 14:16:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 13034496 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 004FFC433FE for ; Mon, 7 Nov 2022 14:35:12 +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=Tf0MTUnjRrcxHt HwEfpWvy8+adI0yCRMYwpMv2DWae4NY6cJUPh9iMIfDwo7XVTCJswp6vBoD9/nZg3Vnn7PmgcRDQE Fbr1IlQnWR7sI3WKVdHZ6BHUESy2JNhPfWpjC04uDxMXbqRVB6681Rr78WIWI7CSC5dJ3vA+C97+y uU3o5pDEw/SIjXrTUl9+lxj9PpwGdxUtC0T9fIW996SU/fBNLKrhk8S3KyxzIm//9+ulSuSTFtzbG 53JTxyGVqPAuUlAJN0QF7E8f6EaLx5PLdv+a0SYdI8eeRX9yCCzKOFXWOtSpzIyRFEftnxGnkRDIU mdK3x9shs6gFw39l/+aA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1os3C7-00FGM8-K3; Mon, 07 Nov 2022 14:33:47 +0000 Received: from wnew2-smtp.messagingengine.com ([64.147.123.27]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1os2x6-00FAU1-Db for linux-arm-kernel@lists.infradead.org; Mon, 07 Nov 2022 14:18:18 +0000 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailnew.west.internal (Postfix) with ESMTP id CE57A2B0670C; Mon, 7 Nov 2022 09:18:13 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Mon, 07 Nov 2022 09:18:16 -0500 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=fm2; t=1667830693; x= 1667837893; bh=7oYNZ/WLyFOxEAuVgKzwZ3R8/Ec3wa7tyLYyhZ7n/Ac=; b=U WVt0NRqrOKzhg0jaWB6KwmoUajoNImWOsli1vhP4lHF48CgGnaJyOwaf7f9g8ZKO yYZsYz25h0d6v2ls6m1w+lCx473ttf2nj0cloqaJevsfUmoAyrrVrs9kzwg5lniy +oaSBTl9PcgHSlm8LJfih0+1Yqq24RvUktwayKD3hNE8ylcG4FBYbR/XsD9Vd/2D yH6mrdR62fUn9yciHD52FKCcIzY2Ritq/7oINP0wfHE4+p0H47W4scYnP5m83IuH pVPJNKNMkO9jYyQ93f3/dkZeinkYPfpE0DudmT6M7hzIoHQ++UTLZvYRuwms3zuN 2lPpo4nKbQx2MHDtE/TWg== 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=fm1; t=1667830693; x= 1667837893; bh=7oYNZ/WLyFOxEAuVgKzwZ3R8/Ec3wa7tyLYyhZ7n/Ac=; b=L GFdWG3Mjm185NnfeLLEY7l4YzHxgB75dJ+i5Y6t965fF0WaTEZMKSkPsPvEE1Wuh h6nm4k++gLJMuNWYMx+YA2nWr3rs+VFRvIKXm8CJMxl2UMBVY4pfoDq3nvdhFTLh D0b+qkrcRO1FrXDYEqWUoOyYalH/pq0g4ZvxOBDGZBdwzJH2EhOGW8zcQ5TqWJgH lMIzuawZsX/3oyV1NdBgV9bUs0Ju7Kt7BxjGUA9qr6gleeVbSnfL+55AKHWuN45o ptBlCohLqRWodOdwTeZcmVnSdJDNyDx5TPIeE5JsTgAPr3EqwsvaoxIHYCnNT2VQ FiUcAAjJdVvloi7nInxVw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrvdekgdeivdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhfffuggfgtgfkfhgjvfevofesthekredtredtjeenucfhrhhomhepofgrgihi mhgvucftihhprghrugcuoehmrgigihhmvgestggvrhhnohdrthgvtghhqeenucggtffrrg htthgvrhhnpedvgfevjefhtdetveevhfelieeuueetgfdvgeevkeegudejffegfffgtedt leelhfenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpe hmrgigihhmvgestggvrhhnohdrthgvtghh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 7 Nov 2022 09:18:12 -0500 (EST) From: Maxime Ripard Date: Mon, 07 Nov 2022 15:16:46 +0100 Subject: [PATCH v7 20/23] drm/vc4: vec: Check for VEC output constraints MIME-Version: 1.0 Message-Id: <20220728-rpi-analog-tv-properties-v7-20-7072a478c6b3@cerno.tech> References: <20220728-rpi-analog-tv-properties-v7-0-7072a478c6b3@cerno.tech> In-Reply-To: <20220728-rpi-analog-tv-properties-v7-0-7072a478c6b3@cerno.tech> To: Jani Nikula , Joonas Lahtinen , Tvrtko Ursulin , Ben Skeggs , Rodrigo Vivi , Maxime Ripard , Samuel Holland , Jernej Skrabec , Maarten Lankhorst , Emma Anholt , Karol Herbst , Daniel Vetter , Chen-Yu Tsai , Lyude Paul , Thomas Zimmermann , David Airlie Cc: =?unknown-8bit?q?Phil_Elwell_=3Cphil=40raspberrypi=2Ecom=3E=2C_Maxime_Ri?= =?unknown-8bit?q?pard_=3Cmaxime=40cerno=2Etech=3E=2C_Hans_de_Goede_=3Chdego?= =?unknown-8bit?q?ede=40redhat=2Ecom=3E=2C?= =?unknown-8bit?q?_linux-sunxi=40lists=2Elinux=2Edev=2C_linux-kernel=40vger?= =?unknown-8bit?q?=2Ekernel=2Eorg=2C_Geert_Uytterhoeven_=3Cgeert=40linux-m68?= =?unknown-8bit?q?k=2Eorg=3E=2C?= =?unknown-8bit?q?_Dave_Stevenson_=3Cdave=2Estevenson=40raspberrypi=2Ecom=3E?= =?unknown-8bit?q?=2C_linux-arm-kernel=40lists=2Einfradead=2Eorg=2C_Dom_Cobl?= =?unknown-8bit?q?ey_=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_intel-gfx=40l?= =?unknown-8bit?q?ists=2Efreedesktop=2Eorg=2C?= =?unknown-8bit?q?_nouveau=40lists=2Efreedesktop=2Eorg=2C_Noralf_Tr=C3=B8nnes?= =?unknown-8bit?q?_=3Cnoralf=40tronnes=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+D1vfrpE4FHG02pJDMmZwg6Z7MKRcsVOWvlz93/p0/+8+v/Zb7cluP5MFUkxtctJ vXO2o5SFQYyLQVZMkSVG2HxJ3KlZrzvZ+ObBzGFlAhnCwMUpABNZzcrIcPBFc/S+PzJiLxlbzlhvsm Te+ntJc+aDWz87JkioKNxR8mb4733A1zP4+0zzjvn5Z5ftDVw+5euNj9qp95XcU5xM5T3vsQAA 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-20221107_061816_531239_9EDE7A71 X-CRM114-Status: GOOD ( 11.35 ) 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; }