From patchwork Fri Sep 15 08:53:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 140249 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp901717vqi; Fri, 15 Sep 2023 01:57:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHVskRXXdfjzmz2XieJjxACTHMTDNYHc3E/jrXcEU2j0XEk9S+lpPvDKc+Pvlwz5WbfbhxD X-Received: by 2002:a17:903:22d1:b0:1b9:c68f:91a5 with SMTP id y17-20020a17090322d100b001b9c68f91a5mr1184956plg.6.1694768251399; Fri, 15 Sep 2023 01:57:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694768251; cv=none; d=google.com; s=arc-20160816; b=qbrygQ9CjUWApkngCTev7clpNyrsXj4KuX6M/ONZwTgY9Vst8t6+tYtRFIDN+y9LwU KTEw8fib7Yab7DduXb14wLXDpPPjs15CAR+YyjPf+1AIkhE4MJnFoo84ruYc77uWj0MC xV4fhuCwaSbhGqirP5s55Zmg4b+lt2qf8chHjGF4txXARbVcsye27QO4GC6yeOWEX9NQ LQ3GrX16mlqTNUTvDGW6MRgfSHrpxK7r2Uv7x93qeAbLRXq4OycEICqabfGeE0LhK9wm /1/npE/KGsUrtv/0ZjiRJ/JBrro4VjZh4lBc7pBkms2xpr6gamKZf5sUST551natZIqh 3AYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=HcJaaxkYAuiryAdWVdNfLmsmkbr3nm+UpX0DKHIXsg0=; fh=5wQWCF8gEfDP7dQFU6OnqlYZzko8ZfxmYVp1pev3Png=; b=k1Ht0fEc4WwKEq4uZi/6NGy3+aywzRzGKU7mnXViS5K3MDpZZ0GEtYjVQtRy1POXcz 6tUIF7U1xKboMqCdx8SAO8thxs5YeBzO4qqzszLjNFYZ75DnSkDM8UzOgVVYSRK8ue+k B+j8eGCgG6dbiDTjjG2463mKQqE4P1ulpwE6Ws1hMQDxyU0vaNR3zuLjw78D8R47zSAq xUL0lbX0TYRTbalN+BHSOo9lqns89rYujQqwvp/C3kBbk9dVTDVOKww6P7gXPh+SF2W4 dSRtkJbkNm3qH7+Pv/auYDg5ufzLEfM+EdpB0hh/qMfJ1SbwM4Us5Rt1tviKOpju24dA ByWQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id a7-20020a170902ecc700b001bb9375b349si2837052plh.536.2023.09.15.01.57.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 01:57:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 766E583B1847; Fri, 15 Sep 2023 01:54:54 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233353AbjIOIyc (ORCPT + 32 others); Fri, 15 Sep 2023 04:54:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48484 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233143AbjIOIyY (ORCPT ); Fri, 15 Sep 2023 04:54:24 -0400 Received: from baptiste.telenet-ops.be (baptiste.telenet-ops.be [IPv6:2a02:1800:120:4::f00:13]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0C08D2720 for ; Fri, 15 Sep 2023 01:54:16 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:7135:da8b:ba1d:1a7c]) by baptiste.telenet-ops.be with bizsmtp id m8uE2A00e3q21w7018uE2B; Fri, 15 Sep 2023 10:54:15 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qh4aJ-003lH0-K2; Fri, 15 Sep 2023 10:54:14 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qh4ac-00Gdc4-Kh; Fri, 15 Sep 2023 10:54:14 +0200 From: Geert Uytterhoeven To: Laurent Pinchart , Kieran Bingham , David Airlie , Daniel Vetter , Thomas Zimmermann , Magnus Damm Cc: dri-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v4 18/41] drm: renesas: shmobile: Remove custom plane destroy callback Date: Fri, 15 Sep 2023 10:53:33 +0200 Message-Id: <8d7a3f250612085fdf4e06d377843e8f874b22d9.1694767209.git.geert+renesas@glider.be> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Fri, 15 Sep 2023 01:54:54 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777093313655942038 X-GMAIL-MSGID: 1777093313655942038 There is no need to call drm_plane_force_disable() from the plane's .destroy() callback, as the plane should have been disabled already before. See also commit 3c858a33858baa8c ("drm/plane_helper: don't disable plane in destroy function") for the generic plane helper case. After removing this call, shmob_drm_plane_destroy() becomes a simple wrapper around shmob_drm_plane_destroy(), hence replace it by the latter. Signed-off-by: Geert Uytterhoeven --- v4: - No changes, v3: - No changes, v2: - New. --- drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c index 0b2ab153e9ae76df..3a5db319bad14218 100644 --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c @@ -176,16 +176,10 @@ static int shmob_drm_plane_disable(struct drm_plane *plane, return 0; } -static void shmob_drm_plane_destroy(struct drm_plane *plane) -{ - drm_plane_force_disable(plane); - drm_plane_cleanup(plane); -} - static const struct drm_plane_funcs shmob_drm_plane_funcs = { .update_plane = shmob_drm_plane_update, .disable_plane = shmob_drm_plane_disable, - .destroy = shmob_drm_plane_destroy, + .destroy = drm_plane_cleanup, }; static const uint32_t formats[] = {