From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6162CC55ABD for ; Fri, 13 Nov 2020 15:34:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 225BA22281 for ; Fri, 13 Nov 2020 15:34:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726894AbgKMPcX (ORCPT ); Fri, 13 Nov 2020 10:32:23 -0500 Received: from new2-smtp.messagingengine.com ([66.111.4.224]:57201 "EHLO new2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726691AbgKMPcV (ORCPT ); Fri, 13 Nov 2020 10:32:21 -0500 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailnew.nyi.internal (Postfix) with ESMTP id A404A580337; Fri, 13 Nov 2020 10:32:20 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Fri, 13 Nov 2020 10:32:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cerno.tech; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm1; bh=yRH3HGKMxPkCB hafEQ18e2pDZzkLwu+GD/KNu//gUW4=; b=WcIe1mM0nCnIDgZNeflQAlK+eRMz5 /5W9LTtimER3uUaP1SKqrOP2oTsCohsWxgbVVXgW5ZE8xbXYWkhQtQqV3I1rECF+ IC+rxUizxBomjxz5o0qEZWI2ltGo0PPhELQ9rMaTsoMu41hPEUrPEQ0ikbOLR8rq V8HMBqa1lr6S9HKFv51LYeaIsI19K3qUo8nSxd+ZC7pa2Xz2FE+NmZ0U01fGWWm6 Wwgm7SVcOsY58A1dwsGHqkfHghHUzPRvCaS4S/WNGRu4rT/0kV32n5zJ1H4kR/BK 8+SF4AHy3EaVE+0UZNOiLQXTjfMDq4uYDedfwdLdhTljhRXCHQ32sf2Gw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=yRH3HGKMxPkCBhafEQ18e2pDZzkLwu+GD/KNu//gUW4=; b=NA0zWuTf z9whVxz+KxSUTqIguzPh1U20BPbRoZCLPNQ8iLMEmBNdftfgeFXf3druYRDmoASX N6cnE3Xm9vb6DGq6YjhCbcfgN2IiK9afp9lxntd1DnLnOMpwlNQgquzQiTCbtTwO 8Sc01ZSseVECTMbchLLScBsq35Mp+FhdmSa3i8bIx72CaE/DD8bPPZ24Y/eGB2R6 xhaSdO6BLd8owZuS7lbrDBOqHnb2a0SFq8lBZ8hbtiCfy/3GgG4+0WHSkJ/8fOLR QiZZpnN7ggehmyHhHEWA9kFbxrYCpwiZaaTM3aNdNIwT29u2Wl/xJilPkIE5LaaQ wjCHGf2vt5qIYg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedruddvhedgjeejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeforgigihhm vgcutfhiphgrrhguuceomhgrgihimhgvsegtvghrnhhordhtvggthheqnecuggftrfgrth htvghrnhepvdekleevfeffkeejhfffueelteelfeduieefheduudfggffhhfffheevveeh hedvnecukfhppeeltddrkeelrdeikedrjeeinecuvehluhhsthgvrhfuihiivgepudenuc frrghrrghmpehmrghilhhfrhhomhepmhgrgihimhgvsegtvghrnhhordhtvggthh X-ME-Proxy: Received: from localhost (lfbn-tou-1-1502-76.w90-89.abo.wanadoo.fr [90.89.68.76]) by mail.messagingengine.com (Postfix) with ESMTPA id 1F9283064AB0; Fri, 13 Nov 2020 10:32:20 -0500 (EST) From: Maxime Ripard To: Mark Rutland , Rob Herring , Frank Rowand , Eric Anholt , Daniel Vetter , David Airlie , Maarten Lankhorst , Thomas Zimmermann , Maxime Ripard Cc: linux-arm-kernel@lists.infradead.org, linux-rpi-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org, Tim Gover , Phil Elwell , bcm-kernel-feedback-list@broadcom.com, Dave Stevenson , devicetree@vger.kernel.org Subject: [PATCH 3/8] drm/vc4: kms: Move HVS state helpers around Date: Fri, 13 Nov 2020 16:29:51 +0100 Message-Id: <20201113152956.139663-4-maxime@cerno.tech> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201113152956.139663-1-maxime@cerno.tech> References: <20201113152956.139663-1-maxime@cerno.tech> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org We're going to use those helpers in functions higher in that file, let's move it around. Signed-off-by: Maxime Ripard --- drivers/gpu/drm/vc4/vc4_kms.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c index 7ef164afa9e2..d6712924681e 100644 --- a/drivers/gpu/drm/vc4/vc4_kms.c +++ b/drivers/gpu/drm/vc4/vc4_kms.c @@ -182,6 +182,19 @@ vc4_ctm_commit(struct vc4_dev *vc4, struct drm_atomic_state *state) VC4_SET_FIELD(ctm_state->fifo, SCALER_OLEDOFFS_DISPFIFO)); } +static struct vc4_hvs_state * +vc4_hvs_get_global_state(struct drm_atomic_state *state) +{ + struct vc4_dev *vc4 = to_vc4_dev(state->dev); + struct drm_private_state *priv_state; + + priv_state = drm_atomic_get_private_obj_state(state, &vc4->hvs_channels); + if (IS_ERR(priv_state)) + return ERR_CAST(priv_state); + + return to_vc4_hvs_state(priv_state); +} + static void vc4_hvs_pv_muxing_commit(struct vc4_dev *vc4, struct drm_atomic_state *state) { @@ -730,19 +743,6 @@ static int vc4_hvs_channels_obj_init(struct vc4_dev *vc4) return drmm_add_action_or_reset(&vc4->base, vc4_hvs_channels_obj_fini, NULL); } -static struct vc4_hvs_state * -vc4_hvs_get_global_state(struct drm_atomic_state *state) -{ - struct vc4_dev *vc4 = to_vc4_dev(state->dev); - struct drm_private_state *priv_state; - - priv_state = drm_atomic_get_private_obj_state(state, &vc4->hvs_channels); - if (IS_ERR(priv_state)) - return ERR_CAST(priv_state); - - return to_vc4_hvs_state(priv_state); -} - /* * The BCM2711 HVS has up to 7 output connected to the pixelvalves and * the TXP (and therefore all the CRTCs found on that platform). -- 2.28.0