From patchwork Wed Aug 16 09:50:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 135832 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b82d:0:b0:3f2:4152:657d with SMTP id z13csp327842vqi; Wed, 16 Aug 2023 15:45:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEsTtziuB7uaEtY8FsKcLshIAugLugYqyTKpV6XNZb3n7nWqkAV5OZGf/zSEsUN4Gvbk5xE X-Received: by 2002:a17:907:25cd:b0:99b:cdb2:6f5f with SMTP id ae13-20020a17090725cd00b0099bcdb26f5fmr3110912ejc.49.1692225907841; Wed, 16 Aug 2023 15:45:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692225907; cv=none; d=google.com; s=arc-20160816; b=je9q1vykOfELPf3aItcj5WM0qG+S0eODqMoeQIYC0siIuA8oPB8cHJM38PuQzmIXQI y1OWUABKAfsiYOki3BQCfuiKra75MWkoujizAFpm94eOyAh+nBd1uzVmbWEDL/dU4A9U m7qg07MMl0ga6svYxxP3PTInh+WwK9sD9TAO+3QsQxIf3KPmpumuFfaPM8sql7dSzl3e 5TvkgWvxdFxYcTjmJ4QsAeov6eWgNEK+v6oq7sgCOrXToDtFGsVc7CG/ISyazoLUD3pv QNQlNC5ryizvlGt++47otKjMlGNU8EYBBgTf2CUvkTjp5moB5howcgpaO1zO1vx815Hf Ey2w== 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=Zoq9E2uEgBQQ4Fgg8qQgjyhOqS1ilpAUDPD/cpTv8JY=; fh=UWUHlpYIyaM7sVynBT5Ky7qldVK8D81neqNGmwj4p+c=; b=k0hiJrx6lln60yq/YbM6EmnaJlVlbEPzqqzaymL/HkMReBPqWrwZOO3voL1R7Z/Bd5 E8g8K43MHd4DGwDvfIs9VmEBvB7y8Wxu2HRc3NI65VNRkRFWmMPZ5n+HvYnfqSjosdu4 9FsjwOW5KdW9RWhRQBy6aCk1sRhd0842m6FI226ZBV296kpzsSUFb25OOhFMkJo988FR sEOQF+828Rbx5GxplxpVoEMRUW6fd8Z9MgncfWVdjtXKWGOUrDNwEidVG5K/n+9t48la O6ETLy4L620oHQHGgUM8HfPYR+uEdJTthFhkxFB+WmHkVzczitPFCzNzvKOsBwRsTgSD wz7w== 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 a25-20020a170906685900b0099207b3bc46si12070644ejs.322.2023.08.16.15.44.44; Wed, 16 Aug 2023 15:45:07 -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 S235673AbjHPKpf (ORCPT + 99 others); Wed, 16 Aug 2023 06:45:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51846 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241085AbjHPKpD (ORCPT ); Wed, 16 Aug 2023 06:45:03 -0400 Received: from albert.telenet-ops.be (albert.telenet-ops.be [IPv6:2a02:1800:110:4::f00:1a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BDFB82710 for ; Wed, 16 Aug 2023 03:44:43 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:5d0c:f209:12a7:4ce5]) by albert.telenet-ops.be with bizsmtp id aAkh2A00k45ualL06AkhQq; Wed, 16 Aug 2023 12:44:41 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qWE0w-000osK-Ru; Wed, 16 Aug 2023 12:44:41 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qWDAw-00675X-NW; Wed, 16 Aug 2023 11:50:50 +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 v3 18/41] drm: renesas: shmobile: Remove custom plane destroy callback Date: Wed, 16 Aug 2023 11:50:25 +0200 Message-Id: <4562ff5880d2d8681d62e0fcdca210bfd4778486.1692178020.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=-1.6 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE, SPF_NONE autolearn=no 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: 1774427473523018530 X-GMAIL-MSGID: 1774427473523018530 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 --- 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[] = {