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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 0E342C433EF for ; Thu, 14 Jul 2022 09:13:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A462F12B30B; Thu, 14 Jul 2022 09:13:23 +0000 (UTC) Received: from wout5-smtp.messagingengine.com (wout5-smtp.messagingengine.com [64.147.123.21]) by gabe.freedesktop.org (Postfix) with ESMTPS id 162D3A3A90 for ; Thu, 14 Jul 2022 09:13:16 +0000 (UTC) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 63BE8320085B; Thu, 14 Jul 2022 05:13:14 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Thu, 14 Jul 2022 05:13:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cerno.tech; h=cc :cc:content-transfer-encoding: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=1657789993; x=1657876393; bh=CL AC3HbZDPdlV7+gJQ5XZR5Y7ZQlsG+zyeA+sguIMPk=; b=e8SfCD2PErWrrrJDTs IYyg6Fc0YbBQ6z/6r8GMn1Lt8rtZsC2Wp+ItqX5QqC+AJu37CTcYEjqLOOuTyaoj vnsHJPTmZxZSFx1pwqfSDhKN7GghqXzyTC7Yn3/3cjMv+VKJOXrH1eZm8acfNMV1 F42gKa2zK6QYDGJYs+WSfQ/iKrLJy6k77iqindLCcRWvZIpiRyvvCgqOy7DP52v9 blixF1ydRXpzBRcMtsk2SwRhRVpxi0ej8939p1BoMg1KILWzxjo3+RnjV60dKlEx w4kCT8QKtgH2Acem8yz6LLKfFpNwikXsVMbQgnKylVkMDn9ROBi1CQe3W/XQE8cU fXiw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding: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=1657789993; x=1657876393; bh=CLAC3HbZDPdlV 7+gJQ5XZR5Y7ZQlsG+zyeA+sguIMPk=; b=Y2iHUcYwXWWr5zBXglU4RMtJZzBP+ WlHmjKy4coZ8/ytoBv2EtzpfG+0P6BiBGosuVCNLL7cfpG2rROh9PN1dRE8G5biH BmNoIqTMSWuFw4OBKe1m2aB76iDiqMO1M4GJhqM3+bI+/IaEL9n0qroq2NRe1zt4 HhtuHU3qt514HoZPtQ1LbV549Ao8zMFmLBOm+7vrRpCIEym3wwfM/IAsvaJlgfya nnYvB19KZz7y63pR5c/qVPdU2++YWrhH1zDSvTYjh4fqqDohXfoRHJomrLfRCEiK Byks0VFdfjyoQeTG7iUy9nmx4fDtqO36SkzsDGzd8TQ63mMWrOkDtAoqA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrudejledgudefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomhepofgrgihi mhgvucftihhprghrugcuoehmrgigihhmvgestggvrhhnohdrthgvtghhqeenucggtffrrg htthgvrhhnpeelkeefteduhfekjeeihfetudfguedvveekkeetteekhfekhfdtlefgfedu vdejhfenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpe hmrgigihhmvgestggvrhhnohdrthgvtghh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 14 Jul 2022 05:13:13 -0400 (EDT) From: Maxime Ripard To: Daniel Vetter , David Airlie , Maarten Lankhorst , Thomas Zimmermann , Maxime Ripard Subject: [PATCH v3 5/8] drm/vc4: hdmi: Switch to detect_ctx Date: Thu, 14 Jul 2022 11:12:49 +0200 Message-Id: <20220714091252.2089015-6-maxime@cerno.tech> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220714091252.2089015-1-maxime@cerno.tech> References: <20220714091252.2089015-1-maxime@cerno.tech> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Dom Cobley , Tim Gover , Dave Stevenson , dri-devel@lists.freedesktop.org, Phil Elwell Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" We'll need the locking context in future patch, so let's convert .detect to .detect_ctx. Signed-off-by: Maxime Ripard --- drivers/gpu/drm/vc4/vc4_hdmi.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c index 6d84f3b96654..668addc8c170 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -263,8 +263,9 @@ static void vc4_hdmi_handle_hotplug(struct vc4_hdmi *vc4_hdmi, vc4_hdmi_enable_scrambling(&vc4_hdmi->encoder.base.base); } -static enum drm_connector_status -vc4_hdmi_connector_detect(struct drm_connector *connector, bool force) +static int vc4_hdmi_connector_detect_ctx(struct drm_connector *connector, + struct drm_modeset_acquire_ctx *ctx, + bool force) { struct vc4_hdmi *vc4_hdmi = connector_to_vc4_hdmi(connector); enum drm_connector_status status = connector_status_disconnected; @@ -412,7 +413,6 @@ vc4_hdmi_connector_duplicate_state(struct drm_connector *connector) } static const struct drm_connector_funcs vc4_hdmi_connector_funcs = { - .detect = vc4_hdmi_connector_detect, .fill_modes = drm_helper_probe_single_connector_modes, .destroy = vc4_hdmi_connector_destroy, .reset = vc4_hdmi_connector_reset, @@ -421,6 +421,7 @@ static const struct drm_connector_funcs vc4_hdmi_connector_funcs = { }; static const struct drm_connector_helper_funcs vc4_hdmi_connector_helper_funcs = { + .detect_ctx = vc4_hdmi_connector_detect_ctx, .get_modes = vc4_hdmi_connector_get_modes, .atomic_check = vc4_hdmi_connector_atomic_check, }; -- 2.36.1