Message ID | 1e4559e4018d360f0bc6b6ee287a96f94954d9d9.1603888799.git-series.maxime@cerno.tech (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <SRS0=AM15=ED=lists.infradead.org=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@kernel.org> 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 721C6C388F7 for <linux-arm-kernel@archiver.kernel.org>; Wed, 28 Oct 2020 12:44:06 +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 E37D9246D4 for <linux-arm-kernel@archiver.kernel.org>; Wed, 28 Oct 2020 12:44:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="VqD1zBfK"; dkim=temperror (0-bit key) header.d=cerno.tech header.i=@cerno.tech header.b="TpPxR9yw"; dkim=temperror (0-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="A05QqL/Z" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E37D9246D4 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=8yBT4p2UqMHdUTXkMbDVQJ/siDMDKD+diIDdCXNNd/8=; b=VqD1zBfKcmpQHSLSO3sxh9fkf 7/DCzqLam5P6UQfKu7LHvB4lKnrfJ2fcyr8zyukJa4V+0BnF64ZYsIoPOARrZ0Xp9Fh92q0JvW+Lp vYqSato/hbJB6Q2CZEl/6YDcnOeX16DAP4GCRkGXFSoNh59hDKaY3paeviICnfjRRSN/Zyk2Y+TTN Q1QPtzt0Yt5g5x11+1CxE/ckR1HtgwDIB6oTf/PNQXSKfSC7yclitf+w1JnK0YG4XFCDjq0A9B0CS +V7vd+Nd9H0twbiBHv+B4s6en0MFKFdXuB11NdQ9KtXriVR3ESa/UVVYv3jW62mLZ9EzVhwaooqVj 1BADbLYbA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kXklz-0002H7-MK; Wed, 28 Oct 2020 12:41:51 +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 1kXklP-00024O-NJ; Wed, 28 Oct 2020 12:41:19 +0000 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailnew.nyi.internal (Postfix) with ESMTP id 1B0D458011D; Wed, 28 Oct 2020 08:41:09 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Wed, 28 Oct 2020 08:41:09 -0400 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=YV64uopMbyk+l jh3jD2H2gsU90HCtGrUQE6tlckPFVY=; b=TpPxR9ywpYvwMADzDxd5Kc1DB0Si3 D5qSoP4QV6pEbt/C/0yzv662lwI3BpW5V7PlgkMnfDRN4AYIx7CAkFlLesulMn3G lHpBsr2nSmwbXOaRP+xGmRVKTOFYe+PG4EI42qDERiUaEh9y9Vu3yYM7NjwgLANn fm+QEUHP3qWt2McoTXy8XdIbbm/TXmWfWd/M2Rrso4fBXr/zJltPZxzBvyOWeFNv ZlMMswj1kOR5huMXTJMZA3U3dCm+jYWtq3+mS5yjbrqtwUs+stSyy78E9JSREP+n eOa7vky2oThikhndk/8GG0MIr6EbUTIYfa7yQIMTP5Id/rkC8/4pymiBw== 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=YV64uopMbyk+ljh3jD2H2gsU90HCtGrUQE6tlckPFVY=; b=A05QqL/Z GBE1MQumV9YLoAr8F4jm+PyAHO4raGnQ8Td5IPPI4iNJO7Py+JVK1uf2g9qTNZ8q 1MD21sBMg0BmKvpC9VEZ9sihYsTRZdLs3NFcdMUI3onaAIsB64JQ5oO5q3i/SB+N 9IM/1FPRXYPxVXpknZtxNyn4+LBFLXd6aYdbu3YC4OGlRmxLExnmjNgJKESgmxcQ caz8eHzixZEdQ5KViMWqwOEwY7wssUAXxoHac5Dy7QYzJurzdp5q3obZw4eDFel4 Q9ofBp58EGqZhjDhdBtjEKCDETE6g3U+NL7nd+cUiL7z2dJkh7r7mJs6AWIHlOIA h59ltZB0+uiy4w== X-ME-Sender: <xms:5GaZX8LrwV4HgxsHHwurjY2yaYQpAzewhv3EwwS2p_Cp_TThXUQAJg> <xme:5GaZX8LJL20K3TwHVuvL3A-KDQv8UDxIbbSEM1eCmtXC4BVG8b30pHXhcVOghQ1gc -IRJNBjjANXqWMcDyk> X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrledugdegvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepofgrgihimhgv ucftihhprghrugcuoehmrgigihhmvgestggvrhhnohdrthgvtghhqeenucggtffrrghtth gvrhhnpedvkeelveefffekjefhffeuleetleefudeifeehuddugffghffhffehveevheeh vdenucfkphepledtrdekledrieekrdejieenucevlhhushhtvghrufhiiigvpedtnecurf grrhgrmhepmhgrihhlfhhrohhmpehmrgigihhmvgestggvrhhnohdrthgvtghh X-ME-Proxy: <xmx:5GaZX8uL1Z7Oz6ovNeAJLJ0HSmA4Zu09jJ-2CG57Ij8IGlnupDjqbg> <xmx:5GaZX5ZTjKoCYLLOJVW4AcG0ArXPsZmUN3NHNHbN3hl_E1NqsL5-0w> <xmx:5GaZXzYfZA9vo-AqKIM2YwhpHY0s9C3hnVSCHhmu-T_jtzvcrA-81Q> <xmx:5WaZX0KmCmL5_MdE5eNS8zhxKTtThHWIhhEmN6F9jXInDXqauoH59Q> 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 9FFDC306467D; Wed, 28 Oct 2020 08:41:08 -0400 (EDT) From: Maxime Ripard <maxime@cerno.tech> To: Mark Rutland <mark.rutland@arm.com>, Rob Herring <robh+dt@kernel.org>, Frank Rowand <frowand.list@gmail.com>, Daniel Vetter <daniel.vetter@intel.com>, David Airlie <airlied@linux.ie>, Maarten Lankhorst <maarten.lankhorst@linux.intel.com>, Thomas Zimmermann <tzimmermann@suse.de>, Maxime Ripard <maxime@cerno.tech>, Eric Anholt <eric@anholt.net> Subject: [PATCH v2 2/7] drm/vc4: kms: Rename NUM_CHANNELS Date: Wed, 28 Oct 2020 13:40:59 +0100 Message-Id: <1e4559e4018d360f0bc6b6ee287a96f94954d9d9.1603888799.git-series.maxime@cerno.tech> X-Mailer: git-send-email 2.26.2 In-Reply-To: <cover.3eb3532def69f3610b18104e45b7274bbdc1b0a0.1603888799.git-series.maxime@cerno.tech> References: <cover.3eb3532def69f3610b18104e45b7274bbdc1b0a0.1603888799.git-series.maxime@cerno.tech> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201028_084115_857801_F76F34C5 X-CRM114-Status: GOOD ( 13.76 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: <linux-arm-kernel.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Cc: devicetree@vger.kernel.org, Tim Gover <tim.gover@raspberrypi.com>, Dave Stevenson <dave.stevenson@raspberrypi.com>, dri-devel@lists.freedesktop.org, Hoegeun Kwon <hoegeun.kwon@samsung.com>, bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org, Phil Elwell <phil@raspberrypi.com>, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org |
Series |
drm/vc4: Rework the HVS muxing code
|
expand
|
diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c index f8081c996193..80378c74fcd6 100644 --- a/drivers/gpu/drm/vc4/vc4_kms.c +++ b/drivers/gpu/drm/vc4/vc4_kms.c @@ -24,6 +24,8 @@ #include "vc4_drv.h" #include "vc4_regs.h" +#define HVS_NUM_CHANNELS 3 + struct vc4_ctm_state { struct drm_private_state base; struct drm_color_ctm *ctm; @@ -609,12 +611,11 @@ static const struct drm_private_state_funcs vc4_load_tracker_state_funcs = { .atomic_destroy_state = vc4_load_tracker_destroy_state, }; -#define NUM_CHANNELS 3 static int vc4_atomic_check(struct drm_device *dev, struct drm_atomic_state *state) { - unsigned long unassigned_channels = GENMASK(NUM_CHANNELS - 1, 0); + 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;
The NUM_CHANNELS define has a pretty generic name and was right before the function using it. Let's move to something that makes the hardware-specific nature more obvious, and to a more appropriate place. Signed-off-by: Maxime Ripard <maxime@cerno.tech> --- drivers/gpu/drm/vc4/vc4_kms.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)