From patchwork Tue Jul 18 16:54:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 122132 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1880349vqt; Tue, 18 Jul 2023 09:56:09 -0700 (PDT) X-Google-Smtp-Source: APBJJlF6aPIXasQtitwBp2ptsJi2Xr4Ny54KEVaWryPIOBpMai+N1Mu0JM4m9jRSTuZ5rDHTwB0B X-Received: by 2002:a17:902:e809:b0:1ba:1704:8a12 with SMTP id u9-20020a170902e80900b001ba17048a12mr3192035plg.45.1689699368649; Tue, 18 Jul 2023 09:56:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689699368; cv=none; d=google.com; s=arc-20160816; b=AA7/uGWUo7tvtFypxQshl4BmHgka9sPyh0O+RbUNrQQmq8VQW7IFUbIjHwAc0iwh8v dVjzBvCf1mHttmrX8ALEdcduVRZPfqGgGkKSf7cXNxy3F+zZKrcGMnzvo7qz5in6wpcj MQIw9Iyk/PSHqHQnnQBG7W+iXGQ2wkbg3JIxiL9vcvTBbGxpuo5jM55Ee3QPSMdySt7x HFVt6iSOjAL7p70gHgI9ZDiQ2Yzhm1HrjcglJV934nZu+qvP3GYz4uK2d3emgIZRSZt7 4l7KK/NcWoKHAJfS5VnhylsBVXXAyyZsGkDD0uiwpx92DrBeiwjpBMc1NE0TqYZMk/Yy yp4w== 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=ofrA3DpyO2pt5TaLvwsyPU8mUF+A+OmZzD734cZt0lI=; fh=tA0tLsibEoQ30Z7eqHvQDapDuvXXp6os5IletQHgjxM=; b=cgApNqrAK0wu62hABIq2XePqhfeIhKLaRLxEGu+QfWgH1ARB1Xh+hmrcsRUFoArNKX vlmRjyZfl2QvRjXMh98by4qnqoyGS3/27LYFHrSj6heilXKH35UHjg1tHJERADGqawh+ W4Z2dzQhYBDKUoYgXMbUGNoIG4RLY//OMoGFH+SiePLQOz6ieRZwwAZj9yeeTvL+PKgg gSW3svfGKh5GUb/WHOpoBBk0u0UT16S7GUZ81zVPlzPQyZubfs3EYDIlno45diXVuB6T lp3gFwW5odv+rJWhCyQDy1VcXukWbN8klNVWAt9nfOx3XFHJ+Lnd5o8np6LDEreBEk0I etOg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l1-20020a170902d04100b001b06e17610fsi1748930pll.321.2023.07.18.09.55.53; Tue, 18 Jul 2023 09:56:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232527AbjGRQzA (ORCPT + 99 others); Tue, 18 Jul 2023 12:55:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57994 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231912AbjGRQy5 (ORCPT ); Tue, 18 Jul 2023 12:54:57 -0400 Received: from andre.telenet-ops.be (andre.telenet-ops.be [IPv6:2a02:1800:120:4::f00:15]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 01D8C170E for ; Tue, 18 Jul 2023 09:54:54 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:5803:2d6d:5bbc:e252]) by andre.telenet-ops.be with bizsmtp id Ngur2A00F0ucMBo01gurGZ; Tue, 18 Jul 2023 18:54:51 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qLnyD-001nYb-CD; Tue, 18 Jul 2023 18:54:51 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qLnyN-000gcX-DI; Tue, 18 Jul 2023 18:54:51 +0200 From: Geert Uytterhoeven To: Laurent Pinchart , Kieran Bingham , David Airlie , Daniel Vetter , Thomas Zimmermann , Magnus Damm Cc: linux-renesas-soc@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 18/41] drm: renesas: shmobile: Remove custom plane destroy callback Date: Tue, 18 Jul 2023 18:54:23 +0200 Message-Id: <3413108e3110b8b9ca3954769de27326882d0077.1689698048.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=-2.4 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771778205323969114 X-GMAIL-MSGID: 1771778205323969114 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 --- 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[] = {