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,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 884EBC55179 for ; Thu, 5 Nov 2020 13:59:22 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0DA922074B for ; Thu, 5 Nov 2020 13:59:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="KjXlcASl"; dkim=temperror (0-bit key) header.d=cerno.tech header.i=@cerno.tech header.b="i1e6etSy"; dkim=temperror (0-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="FwUIuYVP" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0DA922074B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=cerno.tech Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=eOvk6yL2GSpGdWv65zHnIB1MKBr88VAAmCD6LID/Rfc=; b=KjXlcASl/p6UyHetfRMjWUl/+ H7mp+9v0fzluUR8IXfTk0VHEwylPrXi3UCOSnUTQA6p08gBrgDH3eG1k+gWAyKk0OaXbfK5zE48Eg rZ60bmBt/PiNpQItsaCdk3iZlcCW70f7FUrpZB+/GaD2uok08n+gMzCEgXr08lSRvUk1I0AOt8x/4 1Sq0ZWrZFKxRvdfdIAC1oXWuQHsVMahPru2SgZMQRYZeYduSD4zayKZPlB3pgGtAvTOUzibSBFGw0 zgnX5nxAsyBWpVwIq1aRmLmyulQNSL81mxV7kn3BOIYE2R93zAweQAFcNDQv5qYgk8fRYvtSR5QPs 1hkynzQbw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kaflh-0003mw-UH; Thu, 05 Nov 2020 13:57:37 +0000 Received: from new3-smtp.messagingengine.com ([66.111.4.229]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kaflC-0003aQ-JT; Thu, 05 Nov 2020 13:57:10 +0000 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailnew.nyi.internal (Postfix) with ESMTP id 13E6E580351; Thu, 5 Nov 2020 08:57:05 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Thu, 05 Nov 2020 08:57:05 -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=9dns/4cU1GosP TIVFO95SkN0s7hR99dB8G4XXnW/Y0w=; b=i1e6etSy3awpJufJrPTCLdsq7ZzNE lrrUObvbYlK+wrn9qbLVMe+sVyVHRH/2A7yMqiqBEU/kLOgY5QMW9ZH1mUZ/nKNk yNOMbCK2iCXsBJXnX4UK3x1vNXwJFMQmD2WU+PlK4JSEOrDF0VyO1Xq5jHsPHRjK 5UEmvwgKxFz72LbiAv3zOn0f1Mj04DWPEKxNs6MIVLRldl7vLO/yiP99H+F9Jrnb WEs6XH7PQyFyG3zNBhbkBZ9uIYcDejsQfFEOdY3pQV9pHJCgV9QFq855Cm7D0jx1 WLu+7Vi2j3tO0ZFAtjpHH/NnVe00KK70KqvqeJw6uuBZhobYUTB015YSw== 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=9dns/4cU1GosPTIVFO95SkN0s7hR99dB8G4XXnW/Y0w=; b=FwUIuYVP auV0qn2VS486rGtox/HuhqC55KoRM3SnLlGfmgqXYhY4Lskp+4dSWDNqguHYaYzd hbY3QXrl8vuU1oTG4iXSwR9g/KEAeKk28aJwZpaF5U4timInbAvB8sp0X1rMk5Fr vh5q5tHo3I/pvQlDKEgbUx7sMnZVg66ZC2d8j60IM6It9dgKCKrNF2HJv9Gt/96s gJlxBPaNiWc56dJ9T3UdBWVcMvYiH8j3vilh1oxbz8JLmfHhC4x6q66WmI1XXG5m 6Zurtwlh6Opp7sSDDym93pR3XVM8hxk5sw6u+hDL2P0kqpsQq5ek+lmkLDc+zS/y He9NQzan7EZpPQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedruddtjedgheelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeforgigihhm vgcutfhiphgrrhguuceomhgrgihimhgvsegtvghrnhhordhtvggthheqnecuggftrfgrth htvghrnhepvdekleevfeffkeejhfffueelteelfeduieefheduudfggffhhfffheevveeh hedvnecukfhppeeltddrkeelrdeikedrjeeinecuvehluhhsthgvrhfuihiivgeptdenuc 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 85988306005C; Thu, 5 Nov 2020 08:57:04 -0500 (EST) From: Maxime Ripard To: Eric Anholt , Maarten Lankhorst , Thomas Zimmermann , Maxime Ripard , Daniel Vetter , David Airlie , Mark Rutland , Rob Herring , Frank Rowand Subject: [PATCH v3 4/7] drm/vc4: kms: Split the HVS muxing check in a separate function Date: Thu, 5 Nov 2020 14:56:53 +0100 Message-Id: <20201105135656.383350-5-maxime@cerno.tech> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201105135656.383350-1-maxime@cerno.tech> References: <20201105135656.383350-1-maxime@cerno.tech> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201105_085706_970839_D2BF95EE X-CRM114-Status: GOOD ( 14.71 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Tim Gover , Dave Stevenson , dri-devel@lists.freedesktop.org, Hoegeun Kwon , bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org, Phil Elwell , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The code that assigns HVS channels during atomic_check is starting to grow a bit big, let's move it into a separate function. Reviewed-by: Hoegeun Kwon Tested-by: Hoegeun Kwon Signed-off-by: Maxime Ripard --- drivers/gpu/drm/vc4/vc4_kms.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c index ad69c70f66a2..bb2efc5d2d01 100644 --- a/drivers/gpu/drm/vc4/vc4_kms.c +++ b/drivers/gpu/drm/vc4/vc4_kms.c @@ -662,13 +662,13 @@ static int vc4_load_tracker_obj_init(struct vc4_dev *vc4) return drmm_add_action_or_reset(&vc4->base, vc4_load_tracker_obj_fini, NULL); } -static int -vc4_atomic_check(struct drm_device *dev, struct drm_atomic_state *state) +static int vc4_pv_muxing_atomic_check(struct drm_device *dev, + struct drm_atomic_state *state) { unsigned long unassigned_channels = GENMASK(HVS_NUM_CHANNELS - 1, 0); struct drm_crtc_state *old_crtc_state, *new_crtc_state; struct drm_crtc *crtc; - int i, ret; + unsigned int i; /* * Since the HVS FIFOs are shared across all the pixelvalves and @@ -741,6 +741,18 @@ vc4_atomic_check(struct drm_device *dev, struct drm_atomic_state *state) } } + return 0; +} + +static int +vc4_atomic_check(struct drm_device *dev, struct drm_atomic_state *state) +{ + int ret; + + ret = vc4_pv_muxing_atomic_check(dev, state); + if (ret) + return ret; + ret = vc4_ctm_atomic_check(dev, state); if (ret < 0) return ret; -- 2.28.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel