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=-9.9 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, UNWANTED_LANGUAGE_BODY,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 9F9EDC4741F for ; Thu, 5 Nov 2020 13:57:57 +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 190E32222B for ; Thu, 5 Nov 2020 13:57:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="ZJhqOnB2"; dkim=temperror (0-bit key) header.d=cerno.tech header.i=@cerno.tech header.b="rL/LG7tU"; dkim=temperror (0-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="D8DZKsCQ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 190E32222B 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=Wysg1ONp8qOX1CgpNG+fK8wIgc1pwaa4x8P886sSsOo=; b=ZJhqOnB2L64dK0S+atxeHVErC FhlqU17oNG9CWZ0nFt9FTMWPnDSUvl4WPRcxDrLH0sD+Sc3lEZdz1Sl6dpVXnZA4Osw5bA9ddNRx7 6roxgl57RMyxJ1hdmqpI6y7ErI1HY598ifZ7dHjekV2rZ2NYYmOu+hBWj2fkb2AzqEcrANBfbeT9g 9mbrNDJXKFiCYwyWod4pygovVq/Tt0lraVX6fPXCDBhI27wfpsyTBWzYuehECpf6qKUSuAwmejYKz Z1m2GF5IRnJbo7oyQnla7nE+ge2jys4OwPXeLiUX+IYPt5j3U0cMF9kTrmMjP87yAJF1NuSNQeHhf TAmsT7dTQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kaflM-0003fA-K6; Thu, 05 Nov 2020 13:57:16 +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-0003aG-JT; Thu, 05 Nov 2020 13:57:07 +0000 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailnew.nyi.internal (Postfix) with ESMTP id AC89E580350; Thu, 5 Nov 2020 08:57:03 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Thu, 05 Nov 2020 08:57:03 -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=cOWmP9FJWkEOA dco93J1f7n9mzcuemZoO8pu8QY6wdg=; b=rL/LG7tUMk1VvkAdXHq+93pkAiXjX rvTLlk+dD0nfJRFrONhJCMA17I2mFSYPPNBaKL2ymNnU27OKuN3IhUJu4mjR083l XJwnw7xRRxhHQHY8AMCjOHCdSb5AqnVcU1UH3hMZLXiutQ3Os85wEvs9ISm9b8rG +sJsTczbC0iuZs5TbXAi51gvqGRXuI/NsVv7cbE+Na/1a6fSJBVwLqFz7AvyQv6p DYF9VmbR68Ql/NzVPPD+ADbdPQyuxGeKfC2uVG4nllJGTwDrTq3dgJhoDicSGZle HAaZB+frt5wmH9YjpjmZPoFSelowEtGwon4jzcgdHML2hRsDA3her1G+Q== 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=cOWmP9FJWkEOAdco93J1f7n9mzcuemZoO8pu8QY6wdg=; b=D8DZKsCQ xbT458BDDSwfGmaCA/4uZsNW1rch6PdjXhzdv+xyHDM7GdSqZZswOvVBidtLJLHy ZMGQC7Sfa1zyKuvzwkOeXQNwbH4Juw1LBpyKolD+6fnqIDuCBkMCDW/M+ToCpkIl 3JFJ2XYrRiTORPIlyNXzZh4KhkHjuCgmD0FSvDAVSwhOP3szoc6HrygZhbdVx2hA GYjWjdnyxxnnlrle9B/TLAjDfweI3G79ZIvun3tVPA6PfPqppQYViDOIoWQKoFfS NDqBorYgGsqujU72G4d7Diib5Y58ZZekdDyqrRHfK9ZYFlHnO8AbX58uZyNLRs/Q JkzeVpEWeKpU2g== 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 26DF33060065; Thu, 5 Nov 2020 08:57:03 -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 3/7] drm/vc4: kms: Rename NUM_CHANNELS Date: Thu, 5 Nov 2020 14:56:52 +0100 Message-Id: <20201105135656.383350-4-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_732009_FA459499 X-CRM114-Status: GOOD ( 12.83 ) 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 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. Reviewed-by: Hoegeun Kwon Tested-by: Hoegeun Kwon Signed-off-by: Maxime Ripard --- drivers/gpu/drm/vc4/vc4_kms.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c index 4b558ccb18fe..ad69c70f66a2 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; @@ -660,12 +662,10 @@ 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); } -#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; -- 2.28.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel