From patchwork Fri Jul 29 16:34:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 12932693 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 60FC3C00144 for ; Fri, 29 Jul 2022 17:05:24 +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=94/ILnXk5mJYtoSNxKyVmLhHyDwlkHBXQF01PoRKWn8=; b=O1P0lM7eWz4QLB 0HP7lIWnc6FYRo/+nV60vt0DuzbJ0daucmNFg50aDpKC7RTkaEDeI5eTUYobMov8huyujl8zIUcLP Ku/8PrLc/OvGDc07oM7trUNJWbuyBmclLwSsWkrv/3Xs2EkDSX9pzGJmTtUzXaj2XsLnYLlDqODpj 4ih/Umk6vRBy6AAjDlMWVf1KVfelsYFDy8aXYgXKoTiB0lhXdC1I8l97e3lCN63LYNRl6RwgJnkMH Wx0LGOW6TThCeQKZWupLXxWTrK/FYHRLZ9yQXVtSIpRgQ5Hc4IEWqCbvErUH3xfcKTN+SU6d0c3IF IN0FYZ2WEyb5JC6SmnLg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oHTPC-006t16-Ai; Fri, 29 Jul 2022 17:04:06 +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 1oHSyP-006SOh-D9; Fri, 29 Jul 2022 16:36:27 +0000 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailnew.nyi.internal (Postfix) with ESMTP id 9E44458094F; Fri, 29 Jul 2022 12:36:24 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Fri, 29 Jul 2022 12:36:24 -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=1659112584; x= 1659119784; bh=HUTF54qcrEltxzuIrBwhVolQypRjTlRuOsWlypQ6pmU=; b=Y 3qvbMg0nMPY/sSD+ANhC6NoLOghOrembCe1ttCjztXQ2l7ogT0Y+fWmrmpAH/NXm /9kv0RnY/Qpvn9sF/6zd1Bfr/IjZLrjFMl6SlI0bW3oadrWHw452dKIylhjC0nq1 l+ZK4pDoe8BS5WVBUkosSetZpteAuRQOjOjNtQXCpPOj01Xi8FW7ngYfQNTqypfJ pBW7Feenp5eE6mFwUcr7um5GVrGewPLtUMHCBugBbrkBkPXDMpNtcAmezO5oy/J+ ALu1Up7V2KcKE4RkwOt8OylDVw0QARU/BiJ/dTZ2aLpyFqTWRm5zKruHw2YV7S25 wu5/a7TQmebkxp1WUubeA== 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=1659112584; x= 1659119784; bh=HUTF54qcrEltxzuIrBwhVolQypRjTlRuOsWlypQ6pmU=; b=j x+492p3mBGelDO/J5BTtexdxgdebe0Y6tqY904gOm5dkSo/jHdL8xbP1xOsscBd+ ZuVRBbe2UsGTTKFiv98e8mBwaeRjpQeDXGO/BNFHaDKzlrq5IARsVSgY9TE2W8if SQ/KlAaVbYe9zrrbCbyiXovT2fZ9jxUokUqkeGCnrbrtK/eluymVEUczT/cD0ArT ck+G+JUvvvAEkw+toXuylIBGDhQZfO9lW81HKGiCKuePuld2jHCYi9afWd1PBM+N Dt+F+4hEDdsx/WEw9r8l2FqNWRO2yQZJIu4qTTWU6RWA6QyEwC+iC/N5EX3lNuvv QeCgQgG8cMp6RCRN+BOsw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvddujedguddtgecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufffkffojghfgggtoffgsehtkeertdertdejnecuhfhrohhmpefo rgigihhmvgcutfhiphgrrhguuceomhgrgihimhgvsegtvghrnhhordhtvggthheqnecugg ftrfgrthhtvghrnhepgfffgfetffduudelhfevieffffduleevgfegkeeutefgffejheel leekjeefhfejnecuvehluhhsthgvrhfuihiivgepgeenucfrrghrrghmpehmrghilhhfrh homhepmhgrgihimhgvsegtvghrnhhordhtvggthh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 29 Jul 2022 12:36:22 -0400 (EDT) From: Maxime Ripard To: Jernej Skrabec , Martin Blumenstingl , Chen-Yu Tsai , Philipp Zabel , Jerome Brunet , Samuel Holland , Thomas Zimmermann , Daniel Vetter , Emma Anholt , David Airlie , Maarten Lankhorst , =?utf-8?q?Noralf_Tr?= =?utf-8?q?=C3=B8nnes?= , Kevin Hilman , Neil Armstrong , Maxime Ripard Cc: Maxime Ripard , linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, Phil Elwell , Mateusz Kwiatkowski , linux-arm-kernel@lists.infradead.org, Geert Uytterhoeven , Dave Stevenson , linux-amlogic@lists.infradead.org, dri-devel@lists.freedesktop.org, Dom Cobley Subject: [PATCH v1 16/35] drm/vc4: vec: Convert to atomic helpers Date: Fri, 29 Jul 2022 18:34:59 +0200 Message-Id: <20220728-rpi-analog-tv-properties-v1-16-3d53ae722097@cerno.tech> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220728-rpi-analog-tv-properties-v1-0-3d53ae722097@cerno.tech> References: <20220728-rpi-analog-tv-properties-v1-0-3d53ae722097@cerno.tech> MIME-Version: 1.0 X-Mailer: b4 0.10.0-dev-49460 X-Developer-Signature: v=1; a=openpgp-sha256; l=1629; i=maxime@cerno.tech; h=from:subject:message-id; bh=wVpNGhINRc9XThGUAhn0EA3UH3mvunqoxgBDqkbwN5Q=; b=owGbwMvMwCHc4XzqmfnC7acZT6slMSQ94VG6xvf4oSR3yY7Oi/Vbm2aslYzTtm1Z13u3QovjwtEY HaVvHaUsDMIcDLJiiizXBd/a8YVFuUXwfNgMM4eVCWQIAxenAEwkUpuR4YEvN8NXTddpXNp/8rY+7l Q8udq9SSVyvrLN+WW3pv9f/Ybhf0DqlncdV19tmPb6R/Np8efuewJmutnXrDOMq9xlfi76zHoA 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-20220729_093625_617618_7790CB96 X-CRM114-Status: UNSURE ( 7.51 ) 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 diff --git a/drivers/gpu/drm/vc4/vc4_vec.c b/drivers/gpu/drm/vc4/vc4_vec.c index 17a6afac61cd..ba0a81250d08 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, };