From patchwork Mon Feb 21 09:59:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 12753407 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 474DEC433EF for ; Mon, 21 Feb 2022 10:39:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=V3FA+Y6L5Lee58vuj3w00hHoKZIM5EcNZ3/vL3yT0eM=; b=FyafZZCpmFTtF7 tTER6VUZAP01pjKUckX+WqWQoETchCzsrTNC/sZXhOTEeXfLIzlj4+hk/BvW4J7fdtvzi/Hi6q/s8 0Pe/opwWpQPH1URevS/gguU7adgrfjoHqf9HRmmWq5z6oaVSZTRZU7c3VEbcHR+CBS5/FVrXrjRig T/smJG3Z5UZ6WhyEu9rwxq0nXIl7CFNTUxPGQmRyli0m5y5DL/Y5QXQiWDJQu5TqQTM5RvwFgylhQ I0sobUyJ8JPqJfAUCLIekwIWgtZZlGooPgGrJWp0KB7YDRzNpPsBvxfmqZi0Ru5hkJBM/xonxt/1m hqNC1czMVuNgJ3t2hRLw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nM64m-0050r0-2p; Mon, 21 Feb 2022 10:37:52 +0000 Received: from new2-smtp.messagingengine.com ([66.111.4.224]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nM5Tw-004jJa-GD for linux-arm-kernel@lists.infradead.org; Mon, 21 Feb 2022 09:59:50 +0000 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailnew.nyi.internal (Postfix) with ESMTP id B111D580259; Mon, 21 Feb 2022 04:59:47 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Mon, 21 Feb 2022 04:59:47 -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=Esm2do0nmj72SvXO6N2Mer4L5GKfLq 5MKLEQEdP4jfI=; b=aZWIikjF+oY59WWCb4r+CEU+KQyDBlFZZF9wNA4uBC8/NV kg5M+5q9v1AsbHfwFKXx5a4ZXlwaf8cs8tQNHYJRspohIW54/rkN0Rl+/9TFbk6f azrsUj/IumQDx6f5vyjjQlZNODtiAVbfKpJPlDgTLmMrWGrlC51v15DYHz4DIlA6 RBTAiZrbEh7aaE0cJ9o2jyGta3za/MMGpOnY7FNfM01Hwymxi5VlsYUN2RLmMmAn GD16JsHAIrF8SCQkvU3iwGfZLZ4yebv8ctGp4fdp5tIU9ikrWm+E3e5jTwhTzqPe 9pyZyZDYdAe1RyrU8UjXYWe0moW6YLe8hN38fZbA== 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=Esm2do 0nmj72SvXO6N2Mer4L5GKfLq5MKLEQEdP4jfI=; b=NCTQutcVUHpA45a4KxyMkp 6jUaLSq5JsTYgfo4Bv7/RlhzoQcQKIS4cwXPo3ug2+NoPJ1HeegOOvQsFN64beGA mcSC4/IrHzRDbnzZBY7jFqIuLzVEIRY26lIL66GSk52tW1rFCqwWOEYXGTGc4gcc DjCfMofgbD5O7bbvHbL2lZwvcJSneu7RBPNpu9WzUBtfvLJy4HjB5lHXxkiURNdl mMB7m6jtT9yfIiyVvkaNoEqUhDY+NwmAop53O1jM5THGIJEJkVHjdY4Qx5CSmB7W S2PZ/1eDHXysjN7GUQLn8YOcYTDH6Yf+xexFrl85aBvMnK3xxCtyVuct0/vSVucw == X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddrkeeigddtlecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepofgrgihimhgv ucftihhprghrugcuoehmrgigihhmvgestggvrhhnohdrthgvtghhqeenucggtffrrghtth gvrhhnpedvkeelveefffekjefhffeuleetleefudeifeehuddugffghffhffehveevheeh vdenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepmhgrihhlfhhrohhmpehmrg igihhmvgestggvrhhnohdrthgvtghh X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 21 Feb 2022 04:59:46 -0500 (EST) From: Maxime Ripard To: Daniel Vetter , David Airlie Cc: Dave Stevenson , Phil Elwell , Tim Gover , Dom Cobley , dri-devel@lists.freedesktop.org, Maarten Lankhorst , Thomas Zimmermann , Maxime Ripard , linux-arm-kernel@lists.infradead.org, NXP Linux Team , Fabio Estevam , Pengutronix Kernel Team , Philipp Zabel , Sascha Hauer , Shawn Guo Subject: [PATCH v2 11/22] drm/imx: ipuv3-plane: Remove redundant zpos initialisation Date: Mon, 21 Feb 2022 10:59:07 +0100 Message-Id: <20220221095918.18763-12-maxime@cerno.tech> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220221095918.18763-1-maxime@cerno.tech> References: <20220221095918.18763-1-maxime@cerno.tech> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220221_015948_674529_092E16DA X-CRM114-Status: GOOD ( 10.31 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The imx KMS driver will call drm_plane_create_zpos_property() with an init value depending on the plane purpose. Since the initial value wasn't carried over in the state, the driver had to set it again in ipu_plane_state_reset(). However, the helpers have been adjusted to set it properly at reset, so this is not needed anymore. Cc: linux-arm-kernel@lists.infradead.org Cc: NXP Linux Team Cc: Fabio Estevam Cc: Pengutronix Kernel Team Cc: Philipp Zabel Cc: Sascha Hauer Cc: Shawn Guo Signed-off-by: Maxime Ripard --- drivers/gpu/drm/imx/ipuv3-plane.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/gpu/drm/imx/ipuv3-plane.c b/drivers/gpu/drm/imx/ipuv3-plane.c index 846c1aae69c8..414bdf08d0b0 100644 --- a/drivers/gpu/drm/imx/ipuv3-plane.c +++ b/drivers/gpu/drm/imx/ipuv3-plane.c @@ -297,7 +297,6 @@ void ipu_plane_disable_deferred(struct drm_plane *plane) static void ipu_plane_state_reset(struct drm_plane *plane) { - unsigned int zpos = (plane->type == DRM_PLANE_TYPE_PRIMARY) ? 0 : 1; struct ipu_plane_state *ipu_state; if (plane->state) { @@ -311,8 +310,6 @@ static void ipu_plane_state_reset(struct drm_plane *plane) if (ipu_state) { __drm_atomic_helper_plane_reset(plane, &ipu_state->base); - ipu_state->base.zpos = zpos; - ipu_state->base.normalized_zpos = zpos; ipu_state->base.color_encoding = DRM_COLOR_YCBCR_BT601; ipu_state->base.color_range = DRM_COLOR_YCBCR_LIMITED_RANGE; }