From patchwork Thu Sep 22 14:25: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: 12985362 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 CAE1FC6FA82 for ; Thu, 22 Sep 2022 14:59:14 +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=0s6YNWEqrBZ81y6U9ha0Q21tLVVNbHGPvoKOCYYCL2Q=; b=qeO7E8BOSSYDh3 28FPcLQlqN9mW5+PVnjwKOPqkWfoUrsOBn6shiiNAlGupXGFTJ7A0clDHmZzd/gbanEvWPrYDYtK4 bBM/93fceLxmrE+bJibIdBKXKJwAeUqin/RBdhiWh8EPOF5wc5sL/okKZSdqKDmr+WfcLBFAwDyav FvdE2fpBRD4cadN0iGAHftejvXYLf4vSDZDBtrXoqg6TY60f9/zUrUtEqAhdWll8KAzY2isPg3Smd lOsblxXtg4YtEZNREDp1YLIZG6RPVbnS4H/t4Nblul6xEvtSwvmJVzf7nxFffwB3KJzkRUp1+N2M8 eFQea2mWJYC65dk8cobw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1obNeE-00GDx3-6m; Thu, 22 Sep 2022 14:57:55 +0000 Received: from wnew4-smtp.messagingengine.com ([64.147.123.18]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1obNCN-00G1nA-GF for linux-arm-kernel@lists.infradead.org; Thu, 22 Sep 2022 14:29:09 +0000 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailnew.west.internal (Postfix) with ESMTP id ECF1E2B05B41; Thu, 22 Sep 2022 10:29:03 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Thu, 22 Sep 2022 10:29:06 -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=fm2; t=1663856943; x= 1663864143; bh=bqaynxS1Oq35hJTEKdYTdlLLZ2nj+HwILv/fqb4eFcY=; b=E Xm4TD96uPEjvzbl9Bgo3jchOSzniLjv6WvVeKzNq+KrHSj0x7Fb4Rfu4R5jp+rBZ FUCp6mwTIfBHtfzXoNBoVL70QwViadGBaYY1BxbbmpOZSzcLYUAYkWNQF9gVQ2nO 0AWQmES9MybuTGvLxvsIX0PYdJiKEhIHUb2i0XehbOg2WwYYdNJLuSLjaDULzi6Z wQpcJvTUyxZ98V7lL5s6Dj+G08wVszEpkJv9k7cBhJjroNccdhwQgF2FtyvMG62B XZrkeMKImhq1QF+44Ra4xUbdvokScPEv8Q/gcdLWQNOGaUdpdGQPNIZAalhd9/xA +nGFpwGiQqvRkTpQjUl9g== 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=fm2; t=1663856943; x= 1663864143; bh=bqaynxS1Oq35hJTEKdYTdlLLZ2nj+HwILv/fqb4eFcY=; b=0 0mgSIZbPbgSgkmov/dQnkPbwt6QNMOnLlMNUPzoO/cXpvidbl1vmtnMt2E7lKEFM gsbooqz/C+HmsaXeG9DshL+GHSGFQ3Spa2N02rAqb2qVE9qws5Mp+aowiBtIB+Ei mTRc0+sWxsR2wFon6gGSKfnXqmZPcEcHqwQaMUvVxTJI1uKbC88KF8fGcBFn36Xv aYdb+qkmYYXy1KpBPuMuNiDHFeUXWjYI9nNwFIBqIVP2SpsexIqrxQaM8QY6xsHt E838+OF3obmFoh0Np3drZJeOpL4Bvy4w2tJhb5jcIsyJZ3Sm2SkaYLWR9qo6XAwq 5678YXV37iBaV6ul2qCKw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrfeefgedgudejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephfffufgggfgtkfhfjgfvvefosehtkeertdertdejnecuhfhrohhmpeforgig ihhmvgcutfhiphgrrhguuceomhgrgihimhgvsegtvghrnhhordhtvggthheqnecuggftrf grthhtvghrnhepvdfgveejhfdtteevvefhleeiueeutefgvdegveekgedujeffgeffgfet tdellefhnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomh epmhgrgihimhgvsegtvghrnhhordhtvggthh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 22 Sep 2022 10:29:01 -0400 (EDT) From: Maxime Ripard Date: Thu, 22 Sep 2022 16:25:46 +0200 Subject: [PATCH v2 29/33] drm/vc4: vec: Use TV Reset implementation MIME-Version: 1.0 Message-Id: <20220728-rpi-analog-tv-properties-v2-29-f733a0ed9f90@cerno.tech> References: <20220728-rpi-analog-tv-properties-v2-0-f733a0ed9f90@cerno.tech> In-Reply-To: <20220728-rpi-analog-tv-properties-v2-0-f733a0ed9f90@cerno.tech> To: Jernej Skrabec , Rodrigo Vivi , Ben Skeggs , David Airlie , Maxime Ripard , Joonas Lahtinen , Emma Anholt , Karol Herbst , Samuel Holland , Jani Nikula , Thomas Zimmermann , Daniel Vetter , Lyude Paul , Maarten Lankhorst , Tvrtko Ursulin , Chen-Yu Tsai Cc: =?unknown-8bit?q?Hans_de_Goede_=3Chdegoede=40redhat=2Ecom=3E=2C_nouveau?= =?unknown-8bit?q?=40lists=2Efreedesktop=2Eorg=2C_Geert_Uytterhoeven_=3Cgeer?= =?unknown-8bit?q?t=40linux-m68k=2Eorg=3E=2C?= =?unknown-8bit?q?_Dave_Stevenson_=3Cdave=2Estevenson=40raspberrypi=2Ecom=3E?= =?unknown-8bit?q?=2C_linux-kernel=40vger=2Ekernel=2Eorg=2C_linux-arm-kernel?= =?unknown-8bit?q?=40lists=2Einfradead=2Eorg=2C?= =?unknown-8bit?q?_Phil_Elwell_=3Cphil=40raspberrypi=2Ecom=3E=2C_intel-gfx=40?= =?unknown-8bit?q?lists=2Efreedesktop=2Eorg=2C_Noralf_Tr=C3=B8nnes_=3Cnoralf?= =?unknown-8bit?q?=40tronnes=2Eorg=3E=2C?= =?unknown-8bit?q?_Dom_Cobley_=3Cdom=40raspberrypi=2Ecom=3E=2C_linux-sunxi=40?= =?unknown-8bit?q?lists=2Elinux=2Edev=2C_Maxime_Ripard_=3Cmaxime=40cerno=2Et?= =?unknown-8bit?q?ech=3E=2C?= =?unknown-8bit?q?_Mateusz_Kwiatkowski_=3Ckfyatek+publicgit=40gmail=2Ecom=3E?= =?unknown-8bit?q?=2C_dri-devel=40lists=2Efreedesktop=2Eorg?= X-Mailer: b4 0.10.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1454; i=maxime@cerno.tech; h=from:subject:message-id; bh=B5ugvjxaRYF46qAXVJXIzpYiW47aK3hZcW0sYJuF1G8=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMk6BYFHVy4w1tki+Sy67+cb0RrLWX9UhVW/l7s+O3UhOksk L/dKRykLgxgXg6yYIkuMsPmSuFOzXney8c2DmcPKBDKEgYtTACZyvYXhf/JvF6s4Eb4drya/nTvl7B PrBn25bYdq1GrTn7lzBTFtmsPwT5Fvupb942dP2pn1Rb97Mb5s7Q6NrQ6LV58XHarx9VMPDwA= 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-20220922_072907_661275_428F42A3 X-CRM114-Status: UNSURE ( 8.11 ) X-CRM114-Notice: Please train this message. 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 The analog TV properties created by the drm_mode_create_tv_properties() are not properly initialised at reset. Let's switch our implementation to call drm_atomic_helper_connector_tv_reset(). Reviewed-by: Noralf Trønnes Signed-off-by: Maxime Ripard diff --git a/drivers/gpu/drm/vc4/vc4_vec.c b/drivers/gpu/drm/vc4/vc4_vec.c index 5ec3a12359b1..baa29067a1ff 100644 --- a/drivers/gpu/drm/vc4/vc4_vec.c +++ b/drivers/gpu/drm/vc4/vc4_vec.c @@ -268,6 +268,12 @@ vc4_vec_connector_detect(struct drm_connector *connector, bool force) return connector_status_unknown; } +static void vc4_vec_connector_reset(struct drm_connector *connector) +{ + drm_atomic_helper_connector_reset(connector); + drm_atomic_helper_connector_tv_reset(connector); +} + static int vc4_vec_connector_get_modes(struct drm_connector *connector) { struct drm_connector_state *state = connector->state; @@ -288,7 +294,7 @@ static int vc4_vec_connector_get_modes(struct drm_connector *connector) static const struct drm_connector_funcs vc4_vec_connector_funcs = { .detect = vc4_vec_connector_detect, .fill_modes = drm_helper_probe_single_connector_modes, - .reset = drm_atomic_helper_connector_reset, + .reset = vc4_vec_connector_reset, .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, };