From patchwork Mon Aug 29 13:11: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: 12957937 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 A5E6AECAAD5 for ; Mon, 29 Aug 2022 13:37:40 +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:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Gyf9sYlMN48GwnRJ3oe+6RaNeax3zGcmUIjMZq/Wal4=; b=R7MR8ovQ0cZOEM w+8U6lNrta3tBr5jEdsl4alZmxUgVpzkwqkyDV2bIf/4VWJlEI0M7Jerp6NBW+NZ5Kqe3af8jlPoP 70beVZvrOai3dWGoKEzA2UeBeQ1t2VLuo0xDj0GWovGjLCh7Nt9omxuM7hdUlSx6dpQ3ZnlVwK1Rw KEtG+dsGyyYyCiVyYQD8IjM3MWScKiquY/yIYNw+jRIAFHfayQt9pOJdxK8pdArReM6MqtYE0zhn8 y8xlUqqgfcXX7COJsZkxHQo2D404U+IhnNEs8At3hYNrAI5YfqIIAaHsycnTZUPYYB04e8qfhmKwT tSOBesgfjMPzWr3r8GUg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oSew8-00AloJ-I0; Mon, 29 Aug 2022 13:36:21 +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 1oSebK-00Ab1C-V2 for linux-arm-kernel@lists.infradead.org; Mon, 29 Aug 2022 13:14:53 +0000 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailnew.west.internal (Postfix) with ESMTP id AE7762B06070; Mon, 29 Aug 2022 09:14:47 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Mon, 29 Aug 2022 09:14:50 -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=1661778887; x= 1661786087; bh=1ES+VOTkYU9rnnkPaBougZFX79N+rt0kzSsceGA4Dk4=; b=M wZDwK3QFSLqZ36eWW+KO1/5GMbyX9ChUPOFrT6PvlScVECJOImCcBqpeht8w8ulb ogPSElJUwpgl9ERxHhdYtTltYUcuc61gN7734nHtlWtRaVv3W1oLgMUWs0WmovQd TL6I56S0tCInc4Z4C4chLyUtsSJi9VsUP9bt2BKQ1ZgAzovM6anF2q9X8VN+g//i X5XyOmrXV2k22dO7KJN9awbAlfPmFj71KIxS1T/sTAoJhJ9CGWHnTVr2sgJGxvxe dALbZFQR7Q1cAQjvFgIC//wXd/dGuWblC/yp8GYpDBodShNTCxP15gZntj7/kB1t Stm31oKJUNCzO79AbBQmA== 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=1661778887; x= 1661786087; bh=1ES+VOTkYU9rnnkPaBougZFX79N+rt0kzSsceGA4Dk4=; b=w 97fUtYA19t9UK+q9mCQiBJHAOH+axUa0YqjU5/XMg2iPAhrYN00M/6+SluyFgdvf +69/5+YyOapg1HP2UTkMEatEvoSPwR0PQCbSv/YotPgh4lz0W7BUzVnT30k8rzAg VKL4x5t9nxKpWEyWTlGWrfmfTFMLVq85MkX9iwj40BNVzDKqHVPbcvofyMQxSJHN joCulLM2R+sabLZx2wlXVUCXzLXm/v4rCL8Fv6/DwUT3AgFFRn8/FLXAWNortXTR aNbBzO2JuwTKj2hDrbcguqKooDv1VR8sEzLpZW4pzGWTxMa8d5GHgf4tx8/cQQjz orY73i1Jj6Vf+53W2hKGQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvdekuddgieefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhggtgfogfesthhqredtredtjeenucfhrhhomhepofgr gihimhgvucftihhprghrugcuoehmrgigihhmvgestggvrhhnohdrthgvtghhqeenucggtf frrghtthgvrhhnpeefiedvfefggffgffehveejieffuddtgffhjefggeetieduvdeileet lefgveegtdenucevlhhushhtvghrufhiiigvpeefnecurfgrrhgrmhepmhgrihhlfhhroh hmpehmrgigihhmvgestggvrhhnohdrthgvtghh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 29 Aug 2022 09:14:46 -0400 (EDT) From: Maxime Ripard To: Maxime Ripard , Ben Skeggs , David Airlie , Chen-Yu Tsai , Thomas Zimmermann , Jani Nikula , Lyude Paul , Philipp Zabel , Maarten Lankhorst , Rodrigo Vivi , Tvrtko Ursulin , Jernej Skrabec , Samuel Holland , Karol Herbst , =?utf-8?q?Noralf_Tr=C3=B8nnes?= , Emma Anholt , Daniel Vetter , Joonas Lahtinen Cc: Maxime Ripard , Hans de Goede , linux-arm-kernel@lists.infradead.org, Phil Elwell , intel-gfx@lists.freedesktop.org, Dave Stevenson , dri-devel@lists.freedesktop.org, Dom Cobley , linux-kernel@vger.kernel.org, nouveau@lists.freedesktop.org, linux-sunxi@lists.linux.dev, Mateusz Kwiatkowski , Geert Uytterhoeven Subject: [PATCH v2 25/41] drm/vc4: vec: Convert to atomic helpers Date: Mon, 29 Aug 2022 15:11:39 +0200 Message-Id: <20220728-rpi-analog-tv-properties-v2-25-459522d653a7@cerno.tech> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220728-rpi-analog-tv-properties-v2-0-459522d653a7@cerno.tech> References: <20220728-rpi-analog-tv-properties-v2-0-459522d653a7@cerno.tech> MIME-Version: 1.0 X-Mailer: b4 0.10.0-dev-65ba7 X-Developer-Signature: v=1; a=openpgp-sha256; l=1629; i=maxime@cerno.tech; h=from:subject:message-id; bh=SxDDz/o7uhOTCndIHsGuYDX1d+DNJtbtuvzEgbuAGH4=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMk8uxR+LFyY/Frnu8fpLtE/ZnOKX0TuDe6bF7j1w6svMbv/ emY87ihlYRDjYpAVU2SJETZfEndq1utONr55MHNYmUCGMHBxCsBEMtQZ/rtyan/KSFCUMIrkmjBRka PAOOmKk7KsuOHKvTGhUy0cHjH805uite6Zrn/J+68tOo77wpeGn/cQuD7t6ZTPD1ZZNcmeZgQA 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-20220829_061451_093466_A60D5AF5 X-CRM114-Status: UNSURE ( 7.67 ) 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 VC4 VEC driver still uses legacy enable and disable hook implementation. Let's convert to the atomic variants. Signed-off-by: Maxime Ripard Reviewed-by: Noralf Trønnes diff --git a/drivers/gpu/drm/vc4/vc4_vec.c b/drivers/gpu/drm/vc4/vc4_vec.c index d521ffd8d75c..72eee0cbb615 100644 --- a/drivers/gpu/drm/vc4/vc4_vec.c +++ b/drivers/gpu/drm/vc4/vc4_vec.c @@ -375,7 +375,8 @@ static int vc4_vec_connector_init(struct drm_device *dev, struct vc4_vec *vec) return 0; } -static void vc4_vec_encoder_disable(struct drm_encoder *encoder) +static void vc4_vec_encoder_disable(struct drm_encoder *encoder, + struct drm_atomic_state *state) { struct drm_device *drm = encoder->dev; struct vc4_vec *vec = encoder_to_vc4_vec(encoder); @@ -406,7 +407,8 @@ static void vc4_vec_encoder_disable(struct drm_encoder *encoder) drm_dev_exit(idx); } -static void vc4_vec_encoder_enable(struct drm_encoder *encoder) +static void vc4_vec_encoder_enable(struct drm_encoder *encoder, + struct drm_atomic_state *state) { struct drm_device *drm = encoder->dev; struct vc4_vec *vec = encoder_to_vc4_vec(encoder); @@ -508,9 +510,9 @@ static int vc4_vec_encoder_atomic_check(struct drm_encoder *encoder, } static const struct drm_encoder_helper_funcs vc4_vec_encoder_helper_funcs = { - .disable = vc4_vec_encoder_disable, - .enable = vc4_vec_encoder_enable, .atomic_check = vc4_vec_encoder_atomic_check, + .atomic_disable = vc4_vec_encoder_disable, + .atomic_enable = vc4_vec_encoder_enable, .atomic_mode_set = vc4_vec_encoder_atomic_mode_set, };