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 53049C433FE for ; Mon, 21 Feb 2022 13:42:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E492D10E386; Mon, 21 Feb 2022 13:42:13 +0000 (UTC) Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) by gabe.freedesktop.org (Postfix) with ESMTPS id AA64310E386 for ; Mon, 21 Feb 2022 13:42:09 +0000 (UTC) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 133FF5C0228; Mon, 21 Feb 2022 08:42:09 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Mon, 21 Feb 2022 08:42:09 -0500 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; bh=c3MG28IkIDDaP+2FD0/HIcBYJMqGLk LuATBfhwe3ziM=; b=QMiF/j5noR9aEaeNUhlkwcmOMXiftD0Vz4EGihsGGMAwZ2 /zOKYLjYfEEfpfBHM6k65v9UhcCpw/6L6ZSdlVmHfn0jagxtUgsW/XAMLzlSZRUS 9NmclsnK9xBRR3B03obzJpRB2VxurRCE/xI0KUuvkuI/XHI9QQqWNK0jXu4Ddy26 hToFyrJwKYn4cCWWKXPNsnsHN22uxtUXQE7d9ziY9g+1GDafj47pdXuvU2Fm3lae Q2HMWld2mrZlmWGlRvsIX2O1BVhxk6GO3BKnUQ2z8xz8emRgL6tsDR4JLa8Wl7Kq gZTNnz7VIUc26qr+V+gb2hX99eJijhSpV1PIspBA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; 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:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=c3MG28 IkIDDaP+2FD0/HIcBYJMqGLkLuATBfhwe3ziM=; b=nCqwJ+1soxSJdfZaXzqLBU wfxGnX1C9ZXskBhFiJeYUani86dXp+jSdtE78x6Z+sLsN+pgLlD4Vbf7G3wAELAS A6kWyAcBlisSUnz5H91C2xhMcgA4JTwWFN4DAekz1hN2/xNYW5XFcmDVD98j8TNZ jwGaske59nu35IAvBywrh5CfWFI4V5Oqywkktnzc8yBmz36YWKNCgFp0ducXDjy9 5lW/6ItvwKkqEVFfneE9InwzF08aVMdh+jpqg1OtY9HJo1dPrMo6UBQpjQHhpAT5 0AfNzeEWIJwVQz1nFhdlj2uW2Ri4gYDP5zG4gPzkrCfYBdJlVIIqOQ/8x+5S3Psw == X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddrkeeigdehfecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepofgrgihimhgv ucftihhprghrugcuoehmrgigihhmvgestggvrhhnohdrthgvtghhqeenucggtffrrghtth gvrhhnpedvkeelveefffekjefhffeuleetleefudeifeehuddugffghffhffehveevheeh vdenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepmhgrihhlfhhrohhmpehmrg igihhmvgestggvrhhnohdrthgvtghh X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 21 Feb 2022 08:42:08 -0500 (EST) From: Maxime Ripard To: Daniel Vetter , David Airlie Subject: [PATCH 4/8] drm/vc4: hvs: Remove dlist setup duplication Date: Mon, 21 Feb 2022 14:41:51 +0100 Message-Id: <20220221134155.125447-5-maxime@cerno.tech> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220221134155.125447-1-maxime@cerno.tech> References: <20220221134155.125447-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, Maxime Ripard , Thomas Zimmermann , Phil Elwell Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Setting the DISPLISTx register needs to occur in every case, and we don't need to protect the register using the event_lock, so we can just move it after the if branches and simplify a bit the function. Signed-off-by: Maxime Ripard --- drivers/gpu/drm/vc4/vc4_hvs.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_hvs.c b/drivers/gpu/drm/vc4/vc4_hvs.c index d225eea6e640..71aa5081eaa3 100644 --- a/drivers/gpu/drm/vc4/vc4_hvs.c +++ b/drivers/gpu/drm/vc4/vc4_hvs.c @@ -402,15 +402,12 @@ static void vc4_hvs_update_dlist(struct drm_crtc *crtc) crtc->state->event = NULL; } - HVS_WRITE(SCALER_DISPLISTX(vc4_state->assigned_channel), - vc4_state->mm.start); - spin_unlock_irqrestore(&dev->event_lock, flags); - } else { - HVS_WRITE(SCALER_DISPLISTX(vc4_state->assigned_channel), - vc4_state->mm.start); } + HVS_WRITE(SCALER_DISPLISTX(vc4_state->assigned_channel), + vc4_state->mm.start); + spin_lock_irqsave(&vc4_crtc->irq_lock, flags); vc4_crtc->current_dlist = vc4_state->mm.start; spin_unlock_irqrestore(&vc4_crtc->irq_lock, flags); -- 2.35.1